diff --git a/doc/MIGRATION-v7.md b/doc/MIGRATION-v7.md index b8806e8d429..2f03a419c1c 100644 --- a/doc/MIGRATION-v7.md +++ b/doc/MIGRATION-v7.md @@ -50,7 +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. +- `io.openshift.helm` API group is now part of the `io.fabric8:openshift-model-miscellaneus` module. +- `io.openshift.network` API group is now part of the `io.fabric8:openshift-model-miscellaneus` module. ### Service Catalog removed (operator.openshift.io) diff --git a/kubernetes-model-generator/openapi/generator/cmd/openapi.go b/kubernetes-model-generator/openapi/generator/cmd/openapi.go index b8d53683fcf..d498d617a10 100644 --- a/kubernetes-model-generator/openapi/generator/cmd/openapi.go +++ b/kubernetes-model-generator/openapi/generator/cmd/openapi.go @@ -43,12 +43,11 @@ var openApiRun = func(cobraCmd *cobra.Command, args []string) { targetDirectory = "." } openApiGenerator := openapi.NewGenerator(targetDirectory, "openshift-generated") - openApiGenerator.PutPackageMapping("github.com/openshift/api", "openshift.io") openShiftModule := parser.NewModule("github.com/openshift/api") ///////////////////////////////////////////////////////////////////////////////// // Ported from github.com/openshift/api/openapi/cmd/models-schema/main.go refFunc := func(name string) spec.Ref { - return spec.MustCreateRef(fmt.Sprintf("#/definitions/%s", openApiGenerator.FriendlyName(name))) + return spec.MustCreateRef(fmt.Sprintf("#/definitions/%s", openShiftModule.ApiName(name))) } defs := generated_openapi.GetOpenAPIDefinitions(refFunc) for k, v := range defs { @@ -66,11 +65,11 @@ var openApiRun = func(cobraCmd *cobra.Command, args []string) { // the type. if schema, ok := v.Schema.Extensions[common.ExtensionV2Schema]; ok { if v2Schema, isOpenAPISchema := schema.(spec.Schema); isOpenAPISchema { - openApiGenerator.PutDefinition(openApiGenerator.FriendlyName(k), v2Schema) + openApiGenerator.PutDefinition(openShiftModule.ApiName(k), v2Schema) continue } } - openApiGenerator.PutDefinition(openApiGenerator.FriendlyName(k), v.Schema) + openApiGenerator.PutDefinition(openShiftModule.ApiName(k), v.Schema) } if err := openApiGenerator.WriteDefinitions(); err != nil { diff --git a/kubernetes-model-generator/openapi/generator/cmd/reflection.go b/kubernetes-model-generator/openapi/generator/cmd/reflection.go index 8fc61f065cf..f1ae9001086 100644 --- a/kubernetes-model-generator/openapi/generator/cmd/reflection.go +++ b/kubernetes-model-generator/openapi/generator/cmd/reflection.go @@ -19,6 +19,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" openshiftmachinev1 "github.com/openshift/api/machine/v1" openshiftmachinev1alpha1 "github.com/openshift/api/machine/v1alpha1" + openshiftclusternetworkoperatorv1 "github.com/openshift/cluster-network-operator/pkg/apis/network/v1" "github.com/spf13/cobra" admissionV1 "k8s.io/api/admission/v1" admissionV1Beta1 "k8s.io/api/admission/v1beta1" @@ -125,6 +126,11 @@ var reflectionRun = func(cmd *cobra.Command, args []string) { reflect.TypeOf(openshiftmachinev1.NutanixMachineProviderConfig{}): {false, openshiftmachinev1.GroupVersion.String(), "nutanixmachineproviderconfigs", true}, reflect.TypeOf(openshiftmachinev1.PowerVSMachineProviderConfig{}): {false, openshiftmachinev1.GroupVersion.String(), "powervsmachineproviderconfigs", true}, }, "openshift-machine"), + // OperatorPKI specs are not included in OpenApi + NewPathSchema(map[reflect.Type]ApiVersion{ + reflect.TypeOf(openshiftclusternetworkoperatorv1.OperatorPKIList{}): {true, openshiftclusternetworkoperatorv1.GroupVersion.String(), "operatorpkis", true}, + reflect.TypeOf(openshiftclusternetworkoperatorv1.OperatorPKI{}): {false, openshiftclusternetworkoperatorv1.GroupVersion.String(), "operatorpkis", true}, + }, "openshift-cluster-network-operator"), } generate(schemas, targetDirectory) } diff --git a/kubernetes-model-generator/openapi/generator/go.mod b/kubernetes-model-generator/openapi/generator/go.mod index e8e58189643..3efcc94daf9 100644 --- a/kubernetes-model-generator/openapi/generator/go.mod +++ b/kubernetes-model-generator/openapi/generator/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/getkin/kin-openapi v0.125.0 - // Match lastest commit in the version branch (e.g. release-4.17) + // Match latest commit in the version branch (e.g. release-4.17) github.com/openshift/api v0.0.0-20240912201240-0a8800162826 k8s.io/api v0.30.2 k8s.io/apiextensions-apiserver v0.30.2 @@ -17,7 +17,11 @@ require ( sigs.k8s.io/kustomize/api v0.17.2 ) +// TODO: WIP while this gets merged or fixed https://github.com/openshift/api/pull/2050 +replace github.com/openshift/api => github.com/marcnuri-forks/api v0.0.0-20240930125604-62d5277244a4 + require ( + github.com/openshift/cluster-network-operator v0.0.0-20240912134426-a3188633549d github.com/spf13/cobra v1.8.1 k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 @@ -44,7 +48,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect diff --git a/kubernetes-model-generator/openapi/generator/go.sum b/kubernetes-model-generator/openapi/generator/go.sum index dbc73a08978..14e3cb5526e 100644 --- a/kubernetes-model-generator/openapi/generator/go.sum +++ b/kubernetes-model-generator/openapi/generator/go.sum @@ -49,6 +49,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/marcnuri-forks/api v0.0.0-20240930125604-62d5277244a4 h1:OVm/tM0Io+jkCLhrYvDL4B6zJb9ueRBX36zt7q9KFOU= +github.com/marcnuri-forks/api v0.0.0-20240930125604-62d5277244a4/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -58,8 +60,8 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/openshift/api v0.0.0-20240912201240-0a8800162826 h1:A8D9SN/hJUwAbdO0rPCVTqmuBOctdgurr53gK701SYo= -github.com/openshift/api v0.0.0-20240912201240-0a8800162826/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= +github.com/openshift/cluster-network-operator v0.0.0-20240912134426-a3188633549d h1:9Xf/80gDpRc33FwCEJ6L2/DF1yU/4L6QjoYxKexDzvo= +github.com/openshift/cluster-network-operator v0.0.0-20240912134426-a3188633549d/go.mod h1:qeN8u3CfzClFoykTdlvn0kKngBuVmb3VvWHA51UxiOI= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -70,8 +72,9 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= +github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi.go b/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi.go index 50cbd47b878..71007e630be 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi.go +++ b/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi.go @@ -28,7 +28,6 @@ type Generator struct { name string targetDirectory string definitions map[string]spec.Schema - packageMappings map[string]string } func NewGenerator(targetDirectory string, name string) *Generator { @@ -36,7 +35,6 @@ func NewGenerator(targetDirectory string, name string) *Generator { name: name, targetDirectory: targetDirectory, definitions: make(map[string]spec.Schema), - packageMappings: make(map[string]string), } } @@ -44,10 +42,6 @@ func (g *Generator) PutDefinition(name string, schema spec.Schema) { g.definitions[name] = schema } -func (g *Generator) PutPackageMapping(name, target string) { - g.packageMappings[name] = target -} - func (g *Generator) WriteDefinitions() error { data, err := json.MarshalIndent(&spec.Swagger{ SwaggerProps: spec.SwaggerProps{ @@ -74,13 +68,7 @@ func (g *Generator) WriteDefinitions() error { // FriendlyName returns an OpenAPI friendly name for the given name. // From vendor/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go // https://github.com/kubernetes/apiserver/blob/60d1ca672541e1b30b558e32e53cad7c172345a6/pkg/endpoints/openapi/openapi.go#L136-L147 -func (g *Generator) FriendlyName(name string) string { - for k, v := range g.packageMappings { - if strings.HasPrefix(name, k) { - name = strings.Replace(name, k, v, 1) - break - } - } +func FriendlyName(name string) string { nameParts := strings.Split(name, "/") // Reverse first part. e.g., io.k8s... instead of k8s.io... if len(nameParts) > 0 && strings.Contains(nameParts[0], ".") { diff --git a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go index fc0f7c6f9d5..e284db97aee 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go +++ b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go @@ -17,6 +17,7 @@ package parser import ( "fmt" + "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/openapi/generator/pkg/openapi" "k8s.io/gengo/v2/parser" "k8s.io/gengo/v2/types" "strings" @@ -75,7 +76,7 @@ func (oam *Module) ExtractInfo(definitionName string) *Fabric8Info { func (oam *Module) ApiName(definitionName string) string { if strings.Index(definitionName, oam.Name) != 0 { - return definitionName + return openapi.FriendlyName(definitionName) } lastSeparator := strings.LastIndex(definitionName, ".") typeName := definitionName[lastSeparator+1:] @@ -85,7 +86,7 @@ func (oam *Module) ApiName(definitionName string) string { for i, j := 0, len(groupParts)-1; i < j; i, j = i+1, j-1 { groupParts[i], groupParts[j] = groupParts[j], groupParts[i] } - return strings.Join(groupParts, ".") + "." + typeName + return strings.Join(groupParts, ".") + "." + pkg.Name + "." + typeName } func (oam *Module) resolvePackage(definitionName string) *types.Package { diff --git a/kubernetes-model-generator/openapi/schemas/openshift-cluster-network-operator.json b/kubernetes-model-generator/openapi/schemas/openshift-cluster-network-operator.json new file mode 100644 index 00000000000..5a9bd5286b3 --- /dev/null +++ b/kubernetes-model-generator/openapi/schemas/openshift-cluster-network-operator.json @@ -0,0 +1 @@ +{"components":{"schemas":{"com.github.openshift.cluster-network-operator.pkg.apis.network.v1.CertSpec":{"properties":{"commonName":{"type":"string"}},"type":"object"},"com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKI":{"properties":{"apiVersion":{"type":"string"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"},"spec":{"$ref":"#/components/schemas/com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKISpec"},"status":{"$ref":"#/components/schemas/com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKIStatus"}},"type":"object"},"com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKIList":{"properties":{"apiVersion":{"type":"string"},"items":{"items":{"$ref":"#/components/schemas/com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKI"},"type":"array"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"}},"type":"object"},"com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKISpec":{"properties":{"targetCert":{"$ref":"#/components/schemas/com.github.openshift.cluster-network-operator.pkg.apis.network.v1.CertSpec"}},"type":"object"},"com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKIStatus":{"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-cluster-network-operator","version":"0.0.0"},"openapi":"3.0.0","paths":{"/apis/network.operator.openshift.io/v1/namespaces/{namespace}/operatorpkis":{"get":{"parameters":[{"in":"path","name":"namespace","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKIList"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"network.operator.openshift.io","kind":"OperatorPKIList","version":"v1"}}},"/apis/network.operator.openshift.io/v1/namespaces/{namespace}/operatorpkis/{name}":{"get":{"parameters":[{"in":"path","name":"namespace","required":true},{"in":"path","name":"name","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.cluster-network-operator.pkg.apis.network.v1.OperatorPKI"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"network.operator.openshift.io","kind":"OperatorPKI","version":"v1"}}}}} \ 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 698fb904030..1107d57b5e1 100644 --- a/kubernetes-model-generator/openapi/schemas/openshift-generated.json +++ b/kubernetes-model-generator/openapi/schemas/openshift-generated.json @@ -13496,6 +13496,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "namespace": { "description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces", "type": "string", @@ -13583,6 +13588,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "namespace": { "description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces", "type": "string", @@ -13842,6 +13852,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "namespace": { "description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces", "type": "string", @@ -14224,6 +14239,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "spec": { "description": "Spec adds information about how to conduct the check", "default": {}, @@ -14370,6 +14390,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "namespace": { "description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces", "type": "string", @@ -14483,6 +14508,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "spec": { "description": "Spec adds information about how to conduct the check", "default": {}, @@ -16758,479 +16788,639 @@ "Scope": "Namespaced" } }, - "io.openshift.cloudnetwork.v1.CloudPrivateIPConfig": { - "description": "CloudPrivateIPConfig performs an assignment of a private IP address to the primary NIC associated with cloud VMs. This is done by specifying the IP and Kubernetes node which the IP should be assigned to. This CRD is intended to be used by the network plugin which manages the cluster network. The spec side represents the desired state requested by the network plugin, and the status side represents the current state that this CRD's controller has executed. No users will have permission to modify it, and if a cluster-admin decides to edit it for some reason, their changes will be overwritten the next time the network plugin reconciles the object. Note: the CR's name must specify the requested private IP address (can be IPv4 or IPv6).\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.kubecontrolplane.v1.AggregatorConfig": { + "description": "AggregatorConfig holds information required to make the aggregator function.", "type": "object", "required": [ - "spec" + "proxyClientInfo" + ], + "properties": { + "proxyClientInfo": { + "description": "proxyClientInfo specifies the client cert/key to use when proxying to aggregated API servers", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.CertInfo" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "kubecontrolplane.config.openshift.io", + "Version": "v1", + "Kind": "AggregatorConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.kubecontrolplane.v1.KubeAPIServerConfig": { + "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "servingInfo", + "corsAllowedOrigins", + "auditConfig", + "storageConfig", + "admission", + "kubeClientConfig", + "authConfig", + "aggregatorConfig", + "kubeletClientInfo", + "servicesSubnet", + "servicesNodePortRange", + "consolePublicURL", + "userAgentMatchingConfig", + "imagePolicyConfig", + "projectConfig", + "serviceAccountPublicKeyFiles", + "oauthConfig", + "apiServerArguments" ], "properties": { + "admission": { + "description": "admissionConfig holds information about how to configure admission.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" + }, + "aggregatorConfig": { + "description": "aggregatorConfig has options for configuring the aggregator component of the API server.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.AggregatorConfig" + }, + "apiServerArguments": { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "auditConfig": { + "description": "auditConfig describes how to configure audit information", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" + }, + "authConfig": { + "description": "authConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", + "default": {}, + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.MasterAuthConfig" + }, + "consolePublicURL": { + "description": "DEPRECATED: consolePublicURL has been deprecated and setting it has no effect.", + "type": "string", + "default": "" + }, + "corsAllowedOrigins": { + "description": "corsAllowedOrigins", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "imagePolicyConfig": { + "description": "imagePolicyConfig feeds the image policy admission plugin", + "default": {}, + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.KubeAPIServerImagePolicyConfig" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "kubeClientConfig": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" }, - "spec": { - "description": "spec is the definition of the desired private IP request.", + "kubeletClientInfo": { + "description": "kubeletClientInfo contains information about how to connect to kubelets", "default": {}, - "$ref": "#/definitions/io.openshift.cloudnetwork.v1.CloudPrivateIPConfigSpec" + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.KubeletConnectionInfo" }, - "status": { - "description": "status is the observed status of the desired private IP request. Read-only.", + "oauthConfig": { + "description": "oauthConfig, if present start the /oauth endpoint in this process", + "$ref": "#/definitions/io.openshift.config.osin.v1.OAuthConfig" + }, + "projectConfig": { + "description": "projectConfig feeds an admission plugin", + "default": {}, + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.KubeAPIServerProjectConfig" + }, + "serviceAccountPublicKeyFiles": { + "description": "serviceAccountPublicKeyFiles is a list of files, each containing a PEM-encoded public RSA key. (If any file contains a private key, the public portion of the key is used) The list of public keys is used to verify presented service account tokens. Each key is tried in order until the list is exhausted or verification succeeds. If no keys are specified, no service account authentication will be available.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "servicesNodePortRange": { + "description": "servicesNodePortRange is the range to use for assigning service public ports on a host.", + "type": "string", + "default": "" + }, + "servicesSubnet": { + "description": "servicesSubnet is the subnet to use for assigning service IPs", + "type": "string", + "default": "" + }, + "servingInfo": { + "description": "servingInfo describes how to start serving", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + }, + "storageConfig": { + "description": "storageConfig contains information about how to use", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" + }, + "userAgentMatchingConfig": { + "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", "default": {}, - "$ref": "#/definitions/io.openshift.cloudnetwork.v1.CloudPrivateIPConfigStatus" + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.UserAgentMatchingConfig" } }, "x-fabric8-info": { "Type": "object", - "Group": "cloud.network.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "CloudPrivateIPConfig", - "Scope": "Clustered" + "Kind": "KubeAPIServerConfig", + "Scope": "Namespaced" } }, - "io.openshift.cloudnetwork.v1.CloudPrivateIPConfigSpec": { - "description": "CloudPrivateIPConfigSpec consists of a node name which the private IP should be assigned to.", + "io.openshift.config.kubecontrolplane.v1.KubeAPIServerImagePolicyConfig": { "type": "object", + "required": [ + "internalRegistryHostname", + "externalRegistryHostnames" + ], "properties": { - "node": { - "description": "node is the node name, as specified by the Kubernetes field: node.metadata.name", + "externalRegistryHostnames": { + "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "internalRegistryHostname": { + "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "cloud.network.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "CloudPrivateIPConfigSpec", + "Kind": "KubeAPIServerImagePolicyConfig", "Scope": "Namespaced" } }, - "io.openshift.cloudnetwork.v1.CloudPrivateIPConfigStatus": { - "description": "CloudPrivateIPConfigStatus specifies the node assignment together with its assignment condition.", + "io.openshift.config.kubecontrolplane.v1.KubeAPIServerProjectConfig": { "type": "object", "required": [ - "conditions" + "defaultNodeSelector" ], "properties": { - "conditions": { - "description": "condition is the assignment condition of the private IP and its status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - } - }, - "node": { - "description": "node is the node name, as specified by the Kubernetes field: node.metadata.name", + "defaultNodeSelector": { + "description": "defaultNodeSelector holds default project node label selector", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "cloud.network.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "CloudPrivateIPConfigStatus", + "Kind": "KubeAPIServerProjectConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServer": { - "description": "APIServer holds configuration (like serving certificates, client CA and CORS domains) shared by all API servers in the system, among them especially kube-apiserver and openshift-apiserver. The canonical name of an instance is 'cluster'.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.kubecontrolplane.v1.KubeControllerManagerConfig": { + "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "serviceServingCert", + "projectConfig", + "extendedArguments" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "extendedArguments": { + "description": "extendedArguments is used to configure the kube-controller-manager", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", + "projectConfig": { + "description": "projectConfig is an optimization for the daemonset controller", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.APIServerSpec" + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.KubeControllerManagerProjectConfig" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "serviceServingCert": { + "description": "serviceServingCert provides support for the old alpha service serving cert signer CA bundle", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.APIServerStatus" + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.ServiceServingCert" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServer", - "Scope": "Clustered" + "Kind": "KubeControllerManagerConfig", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServerEncryption": { + "io.openshift.config.kubecontrolplane.v1.KubeControllerManagerProjectConfig": { "type": "object", + "required": [ + "defaultNodeSelector" + ], "properties": { - "type": { - "description": "type defines what encryption type should be used to encrypt resources at the datastore layer. When this field is unset (i.e. when it is set to the empty string), identity is implied. The behavior of unset can and will change over time. Even if encryption is enabled by default, the meaning of unset may change to a different encryption type based on changes in best practices.\n\nWhen encryption is enabled, all sensitive resources shipped with the platform are encrypted. This list of sensitive resources can and will change over time. The current authoritative list is:\n\n 1. secrets\n 2. configmaps\n 3. routes.route.openshift.io\n 4. oauthaccesstokens.oauth.openshift.io\n 5. oauthauthorizetokens.oauth.openshift.io", - "type": "string" + "defaultNodeSelector": { + "description": "defaultNodeSelector holds default project node label selector", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServerEncryption", + "Kind": "KubeControllerManagerProjectConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServerList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.kubecontrolplane.v1.KubeletConnectionInfo": { + "description": "KubeletConnectionInfo holds information necessary for connecting to a kubelet", "type": "object", "required": [ - "metadata", - "items" + "port", + "ca", + "certFile", + "keyFile" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "ca": { + "description": "ca is the CA for verifying TLS connections to kubelets", + "type": "string", + "default": "" }, - "items": { + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" + }, + "port": { + "description": "port is the port to connect to kubelets on", + "type": "integer", + "format": "int64", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "kubecontrolplane.config.openshift.io", + "Version": "v1", + "Kind": "KubeletConnectionInfo", + "Scope": "Namespaced" + } + }, + "io.openshift.config.kubecontrolplane.v1.MasterAuthConfig": { + "description": "MasterAuthConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", + "type": "object", + "required": [ + "requestHeader", + "webhookTokenAuthenticators", + "oauthMetadataFile" + ], + "properties": { + "oauthMetadataFile": { + "description": "oauthMetadataFile is a path to a file containing the discovery endpoint for OAuth 2.0 Authorization Server Metadata for an external OAuth server. See IETF Draft: // https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 This option is mutually exclusive with OAuthConfig", + "type": "string", + "default": "" + }, + "requestHeader": { + "description": "requestHeader holds options for setting up a front proxy against the API. It is optional.", + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.RequestHeaderAuthenticationOptions" + }, + "webhookTokenAuthenticators": { + "description": "webhookTokenAuthenticators, if present configures remote token reviewers", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.APIServer" + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.WebhookTokenAuthenticator" } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServerList", + "Kind": "MasterAuthConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServerNamedServingCert": { - "description": "APIServerNamedServingCert maps a server DNS name, as understood by a client, to a certificate.", + "io.openshift.config.kubecontrolplane.v1.RequestHeaderAuthenticationOptions": { + "description": "RequestHeaderAuthenticationOptions provides options for setting up a front proxy against the entire API instead of against the /oauth endpoint.", "type": "object", "required": [ - "servingCertificate" + "clientCA", + "clientCommonNames", + "usernameHeaders", + "groupHeaders", + "extraHeaderPrefixes" ], "properties": { - "names": { - "description": "names is a optional list of explicit DNS names (leading wildcards allowed) that should use this certificate to serve secure traffic. If no names are provided, the implicit names will be extracted from the certificates. Exact names trump over wildcard names. Explicit names defined here trump over extracted implicit names.", + "clientCA": { + "description": "clientCA is a file with the trusted signer certs. It is required.", + "type": "string", + "default": "" + }, + "clientCommonNames": { + "description": "clientCommonNames is a required list of common names to require a match from.", "type": "array", "items": { "type": "string", "default": "" } }, - "servingCertificate": { - "description": "servingCertificate references a kubernetes.io/tls type secret containing the TLS cert info for serving secure traffic. The secret must exist in the openshift-config namespace and contain the following required fields: - Secret.Data[\"tls.key\"] - TLS private key. - Secret.Data[\"tls.crt\"] - TLS certificate.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "extraHeaderPrefixes": { + "description": "extraHeaderPrefixes is the set of request header prefixes to inspect for user extra. X-Remote-Extra- is suggested.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "groupHeaders": { + "description": "groupHeaders is the set of headers to check for group information. All are unioned.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "usernameHeaders": { + "description": "usernameHeaders is the list of headers to check for user information. First hit wins.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServerNamedServingCert", + "Kind": "RequestHeaderAuthenticationOptions", "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServerServingCerts": { + "io.openshift.config.kubecontrolplane.v1.ServiceServingCert": { + "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", "type": "object", + "required": [ + "certFile" + ], "properties": { - "namedCertificates": { - "description": "namedCertificates references secrets containing the TLS cert info for serving secure traffic to specific hostnames. If no named certificates are provided, or no named certificates match the server name as understood by a client, the defaultServingCertificate will be used.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.APIServerNamedServingCert" - } + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServerServingCerts", + "Kind": "ServiceServingCert", "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServerSpec": { + "io.openshift.config.kubecontrolplane.v1.UserAgentDenyRule": { + "description": "UserAgentDenyRule adds a rejection message that can be used to help a user figure out how to get an approved client", "type": "object", + "required": [ + "regex", + "httpVerbs", + "rejectionMessage" + ], "properties": { - "additionalCORSAllowedOrigins": { - "description": "additionalCORSAllowedOrigins lists additional, user-defined regular expressions describing hosts for which the API server allows access using the CORS headers. This may be needed to access the API and the integrated OAuth server from JavaScript applications. The values are regular expressions that correspond to the Golang regular expression language.", + "httpVerbs": { + "description": "httpVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", "type": "array", "items": { "type": "string", "default": "" } }, - "audit": { - "description": "audit specifies the settings for audit configuration to be applied to all OpenShift-provided API servers in the cluster.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Audit" - }, - "clientCA": { - "description": "clientCA references a ConfigMap containing a certificate bundle for the signers that will be recognized for incoming client certificates in addition to the operator managed signers. If this is empty, then only operator managed signers are valid. You usually only have to set this if you have your own PKI you wish to honor client certificates from. The ConfigMap must exist in the openshift-config namespace and contain the following required fields: - ConfigMap.Data[\"ca-bundle.crt\"] - CA bundle.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "encryption": { - "description": "encryption allows the configuration of encryption of resources at the datastore layer.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.APIServerEncryption" - }, - "servingCerts": { - "description": "servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates will be used for serving secure traffic.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.APIServerServingCerts" + "regex": { + "description": "regex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", + "type": "string", + "default": "" }, - "tlsSecurityProfile": { - "description": "tlsSecurityProfile specifies settings for TLS connections for externally exposed servers.\n\nIf unset, a default (which may change between releases) is chosen. Note that only Old, Intermediate and Custom profiles are currently supported, and the maximum available minTLSVersion is VersionTLS12.", - "$ref": "#/definitions/io.openshift.config.v1.TLSSecurityProfile" + "rejectionMessage": { + "description": "RejectionMessage is the message shown when rejecting a client. If it is not a set, the default message is used.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServerSpec", + "Kind": "UserAgentDenyRule", "Scope": "Namespaced" } }, - "io.openshift.config.v1.APIServerStatus": { + "io.openshift.config.kubecontrolplane.v1.UserAgentMatchRule": { + "description": "UserAgentMatchRule describes how to match a given request based on User-Agent and HTTPVerb", "type": "object", + "required": [ + "regex", + "httpVerbs" + ], + "properties": { + "httpVerbs": { + "description": "httpVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "regex": { + "description": "regex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", + "type": "string", + "default": "" + } + }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "APIServerStatus", + "Kind": "UserAgentMatchRule", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AWSDNSSpec": { - "description": "AWSDNSSpec contains DNS configuration specific to the Amazon Web Services cloud provider.", + "io.openshift.config.kubecontrolplane.v1.UserAgentMatchingConfig": { + "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", "type": "object", + "required": [ + "requiredClients", + "deniedClients", + "defaultRejectionMessage" + ], "properties": { - "privateZoneIAMRole": { - "description": "privateZoneIAMRole contains the ARN of an IAM role that should be assumed when performing operations on the cluster's private hosted zone specified in the cluster DNS config. When left empty, no role should be assumed.", + "defaultRejectionMessage": { + "description": "defaultRejectionMessage is the message shown when rejecting a client. If it is not a set, a generic message is given.", "type": "string", "default": "" + }, + "deniedClients": { + "description": "deniedClients if this list is non-empty, then a User-Agent must not match any of the UserAgentRegexes", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.UserAgentDenyRule" + } + }, + "requiredClients": { + "description": "requiredClients if this list is non-empty, then a User-Agent must match one of the UserAgentRegexes to be allowed", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.kubecontrolplane.v1.UserAgentMatchRule" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "AWSDNSSpec", + "Kind": "UserAgentMatchingConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AWSIngressSpec": { - "description": "AWSIngressSpec holds the desired state of the Ingress for Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "properties": { - "type": { - "description": "type allows user to set a load balancer type. When this field is set the default ingresscontroller will get created using the specified LBType. If this field is not set then the default ingress controller of LBType Classic will be created. Valid values are:\n\n* \"Classic\": A Classic Load Balancer that makes routing decisions at either\n the transport layer (TCP/SSL) or the application layer (HTTP/HTTPS). See\n the following for additional details:\n\n https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#clb\n\n* \"NLB\": A Network Load Balancer that makes routing decisions at the\n transport layer (TCP/SSL). See the following for additional details:\n\n https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#nlb", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "AWSIngressSpec", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": {} - } - ] - }, - "io.openshift.config.v1.AWSPlatformSpec": { - "description": "AWSPlatformSpec holds the desired state of the Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "properties": { - "serviceEndpoints": { - "description": "serviceEndpoints list contains custom endpoints which will override default service endpoint of AWS Services. There must be only one ServiceEndpoint for a service.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AWSServiceEndpoint" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "AWSPlatformSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.AWSPlatformStatus": { - "description": "AWSPlatformStatus holds the current status of the Amazon Web Services infrastructure provider.", - "type": "object", - "required": [ - "region" - ], - "properties": { - "region": { - "description": "region holds the default AWS region for new AWS resources created by the cluster.", - "type": "string", - "default": "" - }, - "resourceTags": { - "description": "resourceTags is a list of additional tags to apply to AWS resources created for the cluster. See https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html for information on tagging AWS resources. AWS supports a maximum of 50 tags per resource. OpenShift reserves 25 tags for its use, leaving 25 tags available for the user.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AWSResourceTag" - }, - "x-kubernetes-list-type": "atomic" - }, - "serviceEndpoints": { - "description": "ServiceEndpoints list contains custom endpoints which will override default service endpoint of AWS Services. There must be only one ServiceEndpoint for a service.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AWSServiceEndpoint" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "AWSPlatformStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.AWSResourceTag": { - "description": "AWSResourceTag is a tag to apply to AWS resources created for the cluster.", + "io.openshift.config.kubecontrolplane.v1.WebhookTokenAuthenticator": { + "description": "WebhookTokenAuthenticators holds the necessary configuation options for external token authenticators", "type": "object", "required": [ - "key", - "value" + "configFile", + "cacheTTL" ], "properties": { - "key": { - "description": "key is the key of the tag", + "cacheTTL": { + "description": "cacheTTL indicates how long an authentication result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get a default timeout of 2 minutes. If zero (e.g. \"0m\"), caching is disabled", "type": "string", "default": "" }, - "value": { - "description": "value is the value of the tag. Some AWS service do not support empty values. Since tags are added to resources in many services, the length of the tag value must meet the requirements of all services.", + "configFile": { + "description": "configFile is a path to a Kubeconfig file with the webhook configuration", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", - "Kind": "AWSResourceTag", + "Kind": "WebhookTokenAuthenticator", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AWSServiceEndpoint": { - "description": "AWSServiceEndpoint store the configuration of a custom url to override existing defaults of AWS Services.", + "io.openshift.config.legacy.v1.ActiveDirectoryConfig": { + "description": "ActiveDirectoryConfig holds the necessary configuration options to define how an LDAP group sync interacts with an LDAP server using the Active Directory schema", "type": "object", "required": [ - "name", - "url" + "usersQuery", + "userNameAttributes", + "groupMembershipAttributes" ], "properties": { - "name": { - "description": "name is the name of the AWS service. The list of all the service names can be found at https://docs.aws.amazon.com/general/latest/gr/aws-service-information.html This must be provided and cannot be empty.", - "type": "string", - "default": "" + "groupMembershipAttributes": { + "description": "GroupMembershipAttributes defines which attributes on an LDAP user entry will be interpreted as the groups it is a member of", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "url": { - "description": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", - "type": "string", - "default": "" + "userNameAttributes": { + "description": "UserNameAttributes defines which attributes on an LDAP user entry will be interpreted as its OpenShift user name.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "usersQuery": { + "description": "AllUsersQuery holds the template for an LDAP query that returns user entries.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LDAPQuery" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AWSServiceEndpoint", + "Kind": "ActiveDirectoryConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AdmissionConfig": { + "io.openshift.config.legacy.v1.AdmissionConfig": { + "description": "AdmissionConfig holds the necessary configuration options for admission", "type": "object", + "required": [ + "pluginConfig" + ], "properties": { - "disabledPlugins": { - "description": "disabledPlugins is a list of admission plugins that must be off. Putting something in this list is almost always a mistake and likely to result in cluster instability.", - "type": "array", - "items": { - "type": "string", - "default": "" + "pluginConfig": { + "description": "PluginConfig allows specifying a configuration file per admission control plugin", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/io.openshift.config.legacy.v1.AdmissionPluginConfig" } }, - "enabledPlugins": { - "description": "enabledPlugins is a list of admission plugins that must be on in addition to the default list. Some admission plugins are disabled by default, but certain configurations require them. This is fairly uncommon and can result in performance penalties and unexpected behavior.", + "pluginOrderOverride": { + "description": "PluginOrderOverride is a list of admission control plugin names that will be installed on the master. Order is significant. If empty, a default list of plugins is used.", "type": "array", "items": { "type": "string", "default": "" } - }, - "pluginConfig": { - "type": "object", - "additionalProperties": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AdmissionPluginConfig" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "AdmissionConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AdmissionPluginConfig": { + "io.openshift.config.legacy.v1.AdmissionPluginConfig": { "description": "AdmissionPluginConfig holds the necessary configuration options for admission plugins", "type": "object", "required": [ @@ -17251,116 +17441,55 @@ }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "AdmissionPluginConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AlibabaCloudPlatformSpec": { - "description": "AlibabaCloudPlatformSpec holds the desired state of the Alibaba Cloud infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "AlibabaCloudPlatformSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.AlibabaCloudPlatformStatus": { - "description": "AlibabaCloudPlatformStatus holds the current status of the Alibaba Cloud infrastructure provider.", - "type": "object", - "required": [ - "region" - ], - "properties": { - "region": { - "description": "region specifies the region for Alibaba Cloud resources created for the cluster.", - "type": "string", - "default": "" - }, - "resourceGroupID": { - "description": "resourceGroupID is the ID of the resource group for the cluster.", - "type": "string" - }, - "resourceTags": { - "description": "resourceTags is a list of additional tags to apply to Alibaba Cloud resources created for the cluster.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AlibabaCloudResourceTag" - }, - "x-kubernetes-list-map-keys": [ - "key" - ], - "x-kubernetes-list-type": "map" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "AlibabaCloudPlatformStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.AlibabaCloudResourceTag": { - "description": "AlibabaCloudResourceTag is the set of tags to add to apply to resources.", + "io.openshift.config.legacy.v1.AggregatorConfig": { + "description": "AggregatorConfig holds information required to make the aggregator function.", "type": "object", "required": [ - "key", - "value" + "proxyClientInfo" ], "properties": { - "key": { - "description": "key is the key of the tag.", - "type": "string", - "default": "" - }, - "value": { - "description": "value is the value of the tag.", - "type": "string", - "default": "" + "proxyClientInfo": { + "description": "ProxyClientInfo specifies the client cert/key to use when proxying to aggregated API servers", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.CertInfo" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AlibabaCloudResourceTag", + "Kind": "AggregatorConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Audit": { + "io.openshift.config.legacy.v1.AllowAllPasswordIdentityProvider": { + "description": "AllowAllPasswordIdentityProvider provides identities for users authenticating using non-empty passwords\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "properties": { - "customRules": { - "description": "customRules specify profiles per group. These profile take precedence over the top-level profile field if they apply. They are evaluation from top to bottom and the first one that matches, applies.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuditCustomRule" - }, - "x-kubernetes-list-map-keys": [ - "group" - ], - "x-kubernetes-list-type": "map" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "profile": { - "description": "profile specifies the name of the desired top-level audit profile to be applied to all requests sent to any of the OpenShift-provided API servers in the cluster (kube-apiserver, openshift-apiserver and oauth-apiserver), with the exception of those requests that match one or more of the customRules.\n\nThe following profiles are provided: - Default: default policy which means MetaData level logging with the exception of events\n (not logged at all), oauthaccesstokens and oauthauthorizetokens (both logged at RequestBody\n level).\n- WriteRequestBodies: like 'Default', but logs request and response HTTP payloads for write requests (create, update, patch). - AllRequestBodies: like 'WriteRequestBodies', but also logs request and response HTTP payloads for read requests (get, list). - None: no requests are logged at all, not even oauthaccesstokens and oauthauthorizetokens.\n\nWarning: It is not recommended to disable audit logging by using the `None` profile unless you are fully aware of the risks of not logging data that can be beneficial when troubleshooting issues. If you disable audit logging and a support situation arises, you might need to enable audit logging and reproduce the issue in order to troubleshoot properly.\n\nIf unset, the 'Default' profile is used as the default.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "Audit", + "Kind": "AllowAllPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AuditConfig": { + "io.openshift.config.legacy.v1.AuditConfig": { "description": "AuditConfig holds configuration for the audit capabilities", "type": "object", "required": [ @@ -17432,629 +17561,594 @@ }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "AuditConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AuditCustomRule": { - "description": "AuditCustomRule describes a custom rule for an audit profile that takes precedence over the top-level profile.", + "io.openshift.config.legacy.v1.AugmentedActiveDirectoryConfig": { + "description": "AugmentedActiveDirectoryConfig holds the necessary configuration options to define how an LDAP group sync interacts with an LDAP server using the augmented Active Directory schema", "type": "object", "required": [ - "group" + "usersQuery", + "userNameAttributes", + "groupMembershipAttributes", + "groupsQuery", + "groupUIDAttribute", + "groupNameAttributes" ], "properties": { - "group": { - "description": "group is a name of group a request user must be member of in order to this profile to apply.", + "groupMembershipAttributes": { + "description": "GroupMembershipAttributes defines which attributes on an LDAP user entry will be interpreted as the groups it is a member of", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "groupNameAttributes": { + "description": "GroupNameAttributes defines which attributes on an LDAP group entry will be interpreted as its name to use for an OpenShift group", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "groupUIDAttribute": { + "description": "GroupUIDAttributes defines which attribute on an LDAP group entry will be interpreted as its unique identifier. (ldapGroupUID)", "type": "string", "default": "" }, - "profile": { - "description": "profile specifies the name of the desired audit policy configuration to be deployed to all OpenShift-provided API servers in the cluster.\n\nThe following profiles are provided: - Default: the existing default policy. - WriteRequestBodies: like 'Default', but logs request and response HTTP payloads for write requests (create, update, patch). - AllRequestBodies: like 'WriteRequestBodies', but also logs request and response HTTP payloads for read requests (get, list). - None: no requests are logged at all, not even oauthaccesstokens and oauthauthorizetokens.\n\nIf unset, the 'Default' profile is used as the default.", - "type": "string" + "groupsQuery": { + "description": "AllGroupsQuery holds the template for an LDAP query that returns group entries.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LDAPQuery" + }, + "userNameAttributes": { + "description": "UserNameAttributes defines which attributes on an LDAP user entry will be interpreted as its OpenShift user name.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "usersQuery": { + "description": "AllUsersQuery holds the template for an LDAP query that returns user entries.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LDAPQuery" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AuditCustomRule", + "Kind": "AugmentedActiveDirectoryConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Authentication": { - "description": "Authentication specifies cluster-wide settings for authentication (like OAuth and webhook token authenticators). The canonical name of an instance is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.BasicAuthPasswordIdentityProvider": { + "description": "BasicAuthPasswordIdentityProvider provides identities for users authenticating using HTTP basic auth credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "url", + "ca", + "certFile", + "keyFile" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "ca": { + "description": "CA is the CA for verifying TLS connections", + "type": "string", + "default": "" + }, + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuthenticationSpec" - }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuthenticationStatus" + "url": { + "description": "URL is the remote URL to connect to", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "Authentication", - "Scope": "Clustered" + "Kind": "BasicAuthPasswordIdentityProvider", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.AuthenticationList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.BuildDefaultsConfig": { + "description": "BuildDefaultsConfig controls the default information for Builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", - "required": [ - "metadata", - "items" - ], "properties": { + "annotations": { + "description": "annotations are annotations that will be added to the build pod", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "items": { + "env": { + "description": "env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Authentication" + "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar" + } + }, + "gitHTTPProxy": { + "description": "gitHTTPProxy is the location of the HTTPProxy for Git source", + "type": "string" + }, + "gitHTTPSProxy": { + "description": "gitHTTPSProxy is the location of the HTTPSProxy for Git source", + "type": "string" + }, + "gitNoProxy": { + "description": "gitNoProxy is the list of domains for which the proxy should not be used", + "type": "string" + }, + "imageLabels": { + "description": "imageLabels is a list of labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "nodeSelector": { + "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "resources": { + "description": "resources defines resource requirements to execute the build.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" + }, + "sourceStrategyDefaults": { + "description": "sourceStrategyDefaults are default values that apply to builds using the source strategy.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.SourceStrategyDefaultsConfig" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AuthenticationList", + "Kind": "BuildDefaultsConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AuthenticationSpec": { + "io.openshift.config.legacy.v1.BuildOverridesConfig": { + "description": "BuildOverridesConfig controls override settings for builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "forcePull" + ], "properties": { - "oauthMetadata": { - "description": "oauthMetadata contains the discovery endpoint data for OAuth 2.0 Authorization Server Metadata for an external OAuth server. This discovery document can be viewed from its served location: oc get --raw '/.well-known/oauth-authorization-server' For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 If oauthMetadata.name is non-empty, this value has precedence over any metadata reference stored in status. The key \"oauthMetadata\" is used to locate the data. If specified and the config map or expected key is not found, no metadata is served. If the specified metadata is not valid, no metadata is served. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "annotations": { + "description": "annotations are annotations that will be added to the build pod", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } }, - "oidcProviders": { - "description": "OIDCProviders are OIDC identity providers that can issue tokens for this cluster Can only be set if \"Type\" is set to \"OIDC\".\n\nAt most one provider can be configured.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "forcePull": { + "description": "forcePull indicates whether the build strategy should always be set to ForcePull=true", + "type": "boolean", + "default": false + }, + "imageLabels": { + "description": "imageLabels is a list of labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OIDCProvider" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" - }, - "serviceAccountIssuer": { - "description": "serviceAccountIssuer is the identifier of the bound service account token issuer. The default is https://kubernetes.default.svc WARNING: Updating this field will not result in immediate invalidation of all bound tokens with the previous issuer value. Instead, the tokens issued by previous service account issuer will continue to be trusted for a time period chosen by the platform (currently set to 24h). This time period is subject to change over time. This allows internal components to transition to use new service account issuer without service distruption.", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" + } }, - "type": { - "description": "type identifies the cluster managed, user facing authentication mode in use. Specifically, it manages the component that responds to login attempts. The default is IntegratedOAuth.", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "webhookTokenAuthenticator": { - "description": "webhookTokenAuthenticator configures a remote token reviewer. These remote authentication webhooks can be used to verify bearer tokens via the tokenreviews.authentication.k8s.io REST API. This is required to honor bearer tokens that are provisioned by an external authentication service.\n\nCan only be set if \"Type\" is set to \"None\".", - "$ref": "#/definitions/io.openshift.config.v1.WebhookTokenAuthenticator" + "nodeSelector": { + "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } }, - "webhookTokenAuthenticators": { - "description": "webhookTokenAuthenticators is DEPRECATED, setting it has no effect.", + "tolerations": { + "description": "tolerations is a list of Tolerations that will override any existing tolerations set on a build pod.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DeprecatedWebhookTokenAuthenticator" - }, - "x-kubernetes-list-type": "atomic" + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" + } } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AuthenticationSpec", + "Kind": "BuildOverridesConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AuthenticationStatus": { + "io.openshift.config.legacy.v1.CertInfo": { + "description": "CertInfo relates a certificate with a private key", "type": "object", "required": [ - "integratedOAuthMetadata", - "oidcClients" + "certFile", + "keyFile" ], "properties": { - "integratedOAuthMetadata": { - "description": "integratedOAuthMetadata contains the discovery endpoint data for OAuth 2.0 Authorization Server Metadata for the in-cluster integrated OAuth server. This discovery document can be viewed from its served location: oc get --raw '/.well-known/oauth-authorization-server' For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 This contains the observed value based on cluster state. An explicitly set value in spec.oauthMetadata has precedence over this field. This field has no meaning if authentication spec.type is not set to IntegratedOAuth. The key \"oauthMetadata\" is used to locate the data. If the config map or expected key is not found, no metadata is served. If the specified metadata is not valid, no metadata is served. The namespace for this config map is openshift-config-managed.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" }, - "oidcClients": { - "description": "OIDCClients is where participating operators place the current OIDC client status for OIDC clients that can be customized by the cluster-admin.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OIDCClientStatus" - }, - "x-kubernetes-list-map-keys": [ - "componentNamespace", - "componentName" - ], - "x-kubernetes-list-type": "map" + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "AuthenticationStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.AzurePlatformSpec": { - "description": "AzurePlatformSpec holds the desired state of the Azure infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AzurePlatformSpec", + "Kind": "CertInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AzurePlatformStatus": { - "description": "AzurePlatformStatus holds the current status of the Azure infrastructure provider.", + "io.openshift.config.legacy.v1.ClientConnectionOverrides": { + "description": "ClientConnectionOverrides are a set of overrides to the default client connection settings.", "type": "object", "required": [ - "resourceGroupName" + "acceptContentTypes", + "contentType", + "qps", + "burst" ], "properties": { - "armEndpoint": { - "description": "armEndpoint specifies a URL to use for resource management in non-soverign clouds such as Azure Stack.", - "type": "string" - }, - "cloudName": { - "description": "cloudName is the name of the Azure cloud environment which can be used to configure the Azure SDK with the appropriate Azure API endpoints. If empty, the value is equal to `AzurePublicCloud`.", - "type": "string" + "acceptContentTypes": { + "description": "AcceptContentTypes defines the Accept header sent by clients when connecting to a server, overriding the default value of 'application/json'. This field will control all connections to the server used by a particular client.", + "type": "string", + "default": "" }, - "networkResourceGroupName": { - "description": "networkResourceGroupName is the Resource Group for network resources like the Virtual Network and Subnets used by the cluster. If empty, the value is same as ResourceGroupName.", - "type": "string" + "burst": { + "description": "Burst allows extra queries to accumulate when a client is exceeding its rate.", + "type": "integer", + "format": "int32", + "default": 0 }, - "resourceGroupName": { - "description": "resourceGroupName is the Resource Group for new Azure resources created for the cluster.", + "contentType": { + "description": "ContentType is the content type used when sending data to the server from this client.", "type": "string", "default": "" }, - "resourceTags": { - "description": "resourceTags is a list of additional tags to apply to Azure resources created for the cluster. See https://docs.microsoft.com/en-us/rest/api/resources/tags for information on tagging Azure resources. Due to limitations on Automation, Content Delivery Network, DNS Azure resources, a maximum of 15 tags may be applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for user configuration.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AzureResourceTag" - }, - "x-kubernetes-list-type": "atomic" + "qps": { + "description": "QPS controls the number of queries per second allowed for this connection.", + "type": "number", + "format": "float", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AzurePlatformStatus", + "Kind": "ClientConnectionOverrides", "Scope": "Namespaced" } }, - "io.openshift.config.v1.AzureResourceTag": { - "description": "AzureResourceTag is a tag to apply to Azure resources created for the cluster.", + "io.openshift.config.legacy.v1.ClusterNetworkEntry": { + "description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.", "type": "object", "required": [ - "key", - "value" + "cidr", + "hostSubnetLength" ], "properties": { - "key": { - "description": "key is the key part of the tag. A tag key can have a maximum of 128 characters and cannot be empty. Key must begin with a letter, end with a letter, number or underscore, and must contain only alphanumeric characters and the following special characters `_ . -`.", + "cidr": { + "description": "CIDR defines the total range of a cluster networks address space.", "type": "string", "default": "" }, - "value": { - "description": "value is the value part of the tag. A tag value can have a maximum of 256 characters and cannot be empty. Value must contain only alphanumeric characters and the following special characters `_ + , - . / : ; \u003c = \u003e ? @`.", - "type": "string", - "default": "" + "hostSubnetLength": { + "description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pod.", + "type": "integer", + "format": "int64", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "AzureResourceTag", + "Kind": "ClusterNetworkEntry", "Scope": "Namespaced" } }, - "io.openshift.config.v1.BareMetalPlatformLoadBalancer": { - "description": "BareMetalPlatformLoadBalancer defines the load balancer used by the cluster on BareMetal platform.", - "type": "object", - "properties": { - "type": { - "description": "type defines the type of load balancer used by the cluster on BareMetal platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", - "type": "string", - "default": "OpenShiftManagedDefault" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "BareMetalPlatformLoadBalancer", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": {} - } - ] - }, - "io.openshift.config.v1.BareMetalPlatformSpec": { - "description": "BareMetalPlatformSpec holds the desired state of the BareMetal infrastructure provider. This only includes fields that can be modified in the cluster.", + "io.openshift.config.legacy.v1.ControllerConfig": { + "description": "ControllerConfig holds configuration values for controllers", "type": "object", + "required": [ + "controllers", + "election", + "serviceServingCert" + ], "properties": { - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.apiServerInternalIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", + "controllers": { + "description": "Controllers is a list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller \"+ named 'foo', '-foo' disables the controller named 'foo'. Defaults to \"*\".", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.ingressIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "election": { + "description": "Election defines the configuration for electing a controller instance to make changes to the cluster. If unspecified, the ControllerTTL value is checked to determine whether the legacy direct etcd election code will be used.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.ControllerElectionConfig" }, - "machineNetworks": { - "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6, for example \"10.0.0.0/8\" or \"fd00::/8\".", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "serviceServingCert": { + "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ServiceServingCert" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BareMetalPlatformSpec", + "Kind": "ControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.BareMetalPlatformStatus": { - "description": "BareMetalPlatformStatus holds the current status of the BareMetal infrastructure provider. For more information about the network architecture used with the BareMetal platform type, see: https://github.com/openshift/installer/blob/master/docs/design/baremetal/networking-infrastructure.md", + "io.openshift.config.legacy.v1.ControllerElectionConfig": { + "description": "ControllerElectionConfig contains configuration values for deciding how a controller will be elected to act as leader.", "type": "object", "required": [ - "apiServerInternalIPs", - "ingressIPs" + "lockName", + "lockNamespace", + "lockResource" ], "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", - "type": "string" - }, - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", - "type": "string" - }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "loadBalancer": { - "description": "loadBalancer defines how the load balancer used by the cluster is configured.", - "default": { - "type": "OpenShiftManagedDefault" - }, - "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformLoadBalancer" + "lockName": { + "description": "LockName is the resource name used to act as the lock for determining which controller instance should lead.", + "type": "string", + "default": "" }, - "machineNetworks": { - "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "lockNamespace": { + "description": "LockNamespace is the resource namespace used to act as the lock for determining which controller instance should lead. It defaults to \"kube-system\"", + "type": "string", + "default": "" }, - "nodeDNSIP": { - "description": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for BareMetal deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", - "type": "string" + "lockResource": { + "description": "LockResource is the group and resource name to use to coordinate for the controller lock. If unset, defaults to \"configmaps\".", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.GroupResource" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BareMetalPlatformStatus", + "Kind": "ControllerElectionConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.BasicAuthIdentityProvider": { - "description": "BasicAuthPasswordIdentityProvider provides identities for users authenticating using HTTP basic auth credentials", + "io.openshift.config.legacy.v1.DNSConfig": { + "description": "DNSConfig holds the necessary configuration options for DNS", "type": "object", "required": [ - "url" + "bindAddress", + "bindNetwork", + "allowRecursiveQueries" ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "tlsClientCert": { - "description": "tlsClientCert is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate to present when connecting to the server. The key \"tls.crt\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "allowRecursiveQueries": { + "description": "AllowRecursiveQueries allows the DNS server on the master to answer queries recursively. Note that open resolvers can be used for DNS amplification attacks and the master DNS should not be made accessible to public networks.", + "type": "boolean", + "default": false }, - "tlsClientKey": { - "description": "tlsClientKey is an optional reference to a secret by name that contains the PEM-encoded TLS private key for the client certificate referenced in tlsClientCert. The key \"tls.key\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "bindAddress": { + "description": "BindAddress is the ip:port to serve DNS on", + "type": "string", + "default": "" }, - "url": { - "description": "url is the remote URL to connect to", + "bindNetwork": { + "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BasicAuthIdentityProvider", + "Kind": "DNSConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Build": { - "description": "Build configures the behavior of OpenShift builds for the entire cluster. This includes default settings that can be overridden in BuildConfig objects, and overrides which are applied to all builds.\n\nThe canonical name is \"cluster\"\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.DefaultAdmissionConfig": { + "description": "DefaultAdmissionConfig can be used to enable or disable various admission plugins. When this type is present as the `configuration` object under `pluginConfig` and *if* the admission plugin supports it, this will cause an \"off by default\" admission plugin to be enabled\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "disable" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "disable": { + "description": "Disable turns off an admission plugin that is enabled by default.", + "type": "boolean", + "default": false + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "Spec holds user-settable values for the build controller configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.BuildSpec" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "Build", - "Scope": "Clustered" - } - }, - "io.openshift.config.v1.BuildDefaults": { - "type": "object", - "properties": { - "defaultProxy": { - "description": "DefaultProxy contains the default proxy settings for all build operations, including image pull/push and source download.\n\nValues can be overrode by setting the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` environment variables in the build config's strategy.", - "$ref": "#/definitions/io.openshift.config.v1.ProxySpec" - }, - "env": { - "description": "Env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar" - } - }, - "gitProxy": { - "description": "GitProxy contains the proxy settings for git operations only. If set, this will override any Proxy settings for all git commands, such as git clone.\n\nValues that are not set here will be inherited from DefaultProxy.", - "$ref": "#/definitions/io.openshift.config.v1.ProxySpec" - }, - "imageLabels": { - "description": "ImageLabels is a list of docker labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageLabel" - } - }, - "resources": { - "description": "Resources defines resource requirements to execute the build.", - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BuildDefaults", + "Kind": "DefaultAdmissionConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.BuildList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.DenyAllPasswordIdentityProvider": { + "description": "DenyAllPasswordIdentityProvider provides no identities for users\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", - "required": [ - "metadata", - "items" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Build" - } - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BuildList", + "Kind": "DenyAllPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.BuildOverrides": { + "io.openshift.config.legacy.v1.DockerConfig": { + "description": "DockerConfig holds Docker related configuration options.", "type": "object", + "required": [ + "execHandlerName", + "dockerShimSocket", + "dockerShimRootDirectory" + ], "properties": { - "forcePull": { - "description": "ForcePull overrides, if set, the equivalent value in the builds, i.e. false disables force pull for all builds, true enables force pull for all builds, independently of what each build specifies itself", - "type": "boolean" - }, - "imageLabels": { - "description": "ImageLabels is a list of docker labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageLabel" - } + "dockerShimRootDirectory": { + "description": "DockershimRootDirectory is the dockershim root directory.", + "type": "string", + "default": "" }, - "nodeSelector": { - "description": "NodeSelector is a selector which must be true for the build pod to fit on a node", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "dockerShimSocket": { + "description": "DockerShimSocket is the location of the dockershim socket the kubelet uses. Currently unix socket is supported on Linux, and tcp is supported on windows. Examples:'unix:///var/run/dockershim.sock', 'tcp://localhost:3735'", + "type": "string", + "default": "" }, - "tolerations": { - "description": "Tolerations is a list of Tolerations that will override any existing tolerations set on a build pod.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" - } + "execHandlerName": { + "description": "ExecHandlerName is the name of the handler to use for executing commands in containers.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BuildOverrides", + "Kind": "DockerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.BuildSpec": { + "io.openshift.config.legacy.v1.EtcdConfig": { + "description": "EtcdConfig holds the necessary configuration options for connecting with an etcd database", "type": "object", + "required": [ + "servingInfo", + "address", + "peerServingInfo", + "peerAddress", + "storageDirectory" + ], "properties": { - "additionalTrustedCA": { - "description": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during builds. The namespace for this config map is openshift-config.\n\nDEPRECATED: Additional CAs for image pull and push should be set on image.config.openshift.io/cluster instead.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "address": { + "description": "Address is the advertised host:port for client connections to etcd", + "type": "string", + "default": "" }, - "buildDefaults": { - "description": "BuildDefaults controls the default information for Builds", + "peerAddress": { + "description": "PeerAddress is the advertised host:port for peer connections to etcd", + "type": "string", + "default": "" + }, + "peerServingInfo": { + "description": "PeerServingInfo describes how to start serving the etcd peer", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.BuildDefaults" + "$ref": "#/definitions/io.openshift.config.legacy.v1.ServingInfo" }, - "buildOverrides": { - "description": "BuildOverrides controls override settings for builds", + "servingInfo": { + "description": "ServingInfo describes how to start serving the etcd master", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.BuildOverrides" + "$ref": "#/definitions/io.openshift.config.legacy.v1.ServingInfo" + }, + "storageDirectory": { + "description": "StorageDir is the path to the etcd storage directory", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "BuildSpec", + "Kind": "EtcdConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.CertInfo": { - "description": "CertInfo relates a certificate with a private key", + "io.openshift.config.legacy.v1.EtcdConnectionInfo": { + "description": "EtcdConnectionInfo holds information necessary for connecting to an etcd server", "type": "object", "required": [ + "urls", + "ca", "certFile", "keyFile" ], "properties": { + "ca": { + "description": "CA is a file containing trusted roots for the etcd server certificates", + "type": "string", + "default": "" + }, "certFile": { "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", @@ -18064,1292 +18158,1392 @@ "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" + }, + "urls": { + "description": "URLs are the URLs for etcd", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "CertInfo", + "Kind": "EtcdConnectionInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClientConnectionOverrides": { + "io.openshift.config.legacy.v1.EtcdStorageConfig": { + "description": "EtcdStorageConfig holds the necessary configuration options for the etcd storage underlying OpenShift and Kubernetes", "type": "object", "required": [ - "acceptContentTypes", - "contentType", - "qps", - "burst" + "kubernetesStorageVersion", + "kubernetesStoragePrefix", + "openShiftStorageVersion", + "openShiftStoragePrefix" ], "properties": { - "acceptContentTypes": { - "description": "acceptContentTypes defines the Accept header sent by clients when connecting to a server, overriding the default value of 'application/json'. This field will control all connections to the server used by a particular client.", + "kubernetesStoragePrefix": { + "description": "KubernetesStoragePrefix is the path within etcd that the Kubernetes resources will be rooted under. This value, if changed, will mean existing objects in etcd will no longer be located. The default value is 'kubernetes.io'.", "type": "string", "default": "" }, - "burst": { - "description": "burst allows extra queries to accumulate when a client is exceeding its rate.", - "type": "integer", - "format": "int32", - "default": 0 + "kubernetesStorageVersion": { + "description": "KubernetesStorageVersion is the API version that Kube resources in etcd should be serialized to. This value should *not* be advanced until all clients in the cluster that read from etcd have code that allows them to read the new version.", + "type": "string", + "default": "" }, - "contentType": { - "description": "contentType is the content type used when sending data to the server from this client.", + "openShiftStoragePrefix": { + "description": "OpenShiftStoragePrefix is the path within etcd that the OpenShift resources will be rooted under. This value, if changed, will mean existing objects in etcd will no longer be located. The default value is 'openshift.io'.", "type": "string", "default": "" }, - "qps": { - "description": "qps controls the number of queries per second allowed for this connection.", - "type": "number", - "format": "float", - "default": 0 + "openShiftStorageVersion": { + "description": "OpenShiftStorageVersion is the API version that OS resources in etcd should be serialized to. This value should *not* be advanced until all clients in the cluster that read from etcd have code that allows them to read the new version.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClientConnectionOverrides", + "Kind": "EtcdStorageConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.CloudControllerManagerStatus": { - "description": "CloudControllerManagerStatus holds the state of Cloud Controller Manager (a.k.a. CCM or CPI) related settings", + "io.openshift.config.legacy.v1.GitHubIdentityProvider": { + "description": "GitHubIdentityProvider provides identities for users authenticating using GitHub credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "clientID", + "clientSecret", + "organizations", + "teams", + "hostname", + "ca" + ], "properties": { - "state": { - "description": "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager\n\nValid values are \"External\", \"None\" and omitted. When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "ca": { + "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server. If empty, the default system roots are used. This can only be configured when hostname is set to a non-empty value.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "CloudControllerManagerStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.CloudLoadBalancerConfig": { - "description": "CloudLoadBalancerConfig contains an union discriminator indicating the type of DNS solution in use within the cluster. When the DNSType is `ClusterHosted`, the cloud's Load Balancer configuration needs to be provided so that the DNS solution hosted within the cluster can be configured with those values.", - "type": "object", - "properties": { - "clusterHosted": { - "description": "clusterHosted holds the IP addresses of API, API-Int and Ingress Load Balancers on Cloud Platforms. The DNS solution hosted within the cluster use these IP addresses to provide resolution for API, API-Int and Ingress services.", - "$ref": "#/definitions/io.openshift.config.v1.CloudLoadBalancerIPs" }, - "dnsType": { - "description": "dnsType indicates the type of DNS solution in use within the cluster. Its default value of `PlatformDefault` indicates that the cluster's DNS is the default provided by the cloud platform. It can be set to `ClusterHosted` to bypass the configuration of the cloud default DNS. In this mode, the cluster needs to provide a self-hosted DNS solution for the cluster's installation to succeed. The cluster's use of the cloud's Load Balancers is unaffected by this setting. The value is immutable after it has been set at install time. Currently, there is no way for the customer to add additional DNS entries into the cluster hosted DNS. Enabling this functionality allows the user to start their own DNS solution outside the cluster after installation is complete. The customer would be responsible for configuring this custom DNS solution, and it can be run in addition to the in-cluster DNS solution.", + "clientID": { + "description": "ClientID is the oauth client ID", "type": "string", - "default": "PlatformDefault" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "CloudLoadBalancerConfig", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "dnsType", - "fields-to-discriminateBy": { - "clusterHosted": "ClusterHosted" - } - } - ] - }, - "io.openshift.config.v1.CloudLoadBalancerIPs": { - "description": "CloudLoadBalancerIPs contains the Load Balancer IPs for the cloud's API, API-Int and Ingress Load balancers. They will be populated as soon as the respective Load Balancers have been configured. These values are utilized to configure the DNS solution hosted within the cluster.", - "type": "object", - "properties": { - "apiIntLoadBalancerIPs": { - "description": "apiIntLoadBalancerIPs holds Load Balancer IPs for the internal API service. These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses. Entries in the apiIntLoadBalancerIPs must be unique. A maximum of 16 IP addresses are permitted.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "default": "" }, - "apiLoadBalancerIPs": { - "description": "apiLoadBalancerIPs holds Load Balancer IPs for the API service. These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses. Could be empty for private clusters. Entries in the apiLoadBalancerIPs must be unique. A maximum of 16 IP addresses are permitted.", + "clientSecret": { + "description": "ClientSecret is the oauth client secret", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.StringSource" + }, + "hostname": { + "description": "Hostname is the optional domain (e.g. \"mycompany.com\") for use with a hosted instance of GitHub Enterprise. It must match the GitHub Enterprise settings value that is configured at /setup/settings#hostname.", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "organizations": { + "description": "Organizations optionally restricts which organizations are allowed to log in", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "set" + } }, - "ingressLoadBalancerIPs": { - "description": "ingressLoadBalancerIPs holds IPs for Ingress Load Balancers. These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses. Entries in the ingressLoadBalancerIPs must be unique. A maximum of 16 IP addresses are permitted.", + "teams": { + "description": "Teams optionally restricts which teams are allowed to log in. Format is \u003corg\u003e/\u003cteam\u003e.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "set" + } } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "CloudLoadBalancerIPs", + "Kind": "GitHubIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterCondition": { - "description": "ClusterCondition is a union of typed cluster conditions. The 'type' property determines which of the type-specific properties are relevant. When evaluated on a cluster, the condition may match, not match, or fail to evaluate.", + "io.openshift.config.legacy.v1.GitLabIdentityProvider": { + "description": "GitLabIdentityProvider provides identities for users authenticating using GitLab credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "type" + "ca", + "url", + "clientID", + "clientSecret" ], "properties": { - "promql": { - "description": "promQL represents a cluster condition based on PromQL.", - "$ref": "#/definitions/io.openshift.config.v1.PromQLClusterCondition" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "type": { - "description": "type represents the cluster-condition type. This defines the members and semantics of any additional properties.", + "ca": { + "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ClusterCondition", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ClusterNetworkEntry": { - "description": "ClusterNetworkEntry is a contiguous block of IP addresses from which pod IPs are allocated.", - "type": "object", - "required": [ - "cidr" - ], - "properties": { - "cidr": { - "description": "The complete block for pod IPs.", + }, + "clientID": { + "description": "ClientID is the oauth client ID", "type": "string", "default": "" }, - "hostPrefix": { - "description": "The size (prefix) of block to allocate to each node. If this field is not used by the plugin, it can be left unset.", - "type": "integer", - "format": "int64" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ClusterNetworkEntry", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ClusterOperator": { - "description": "ClusterOperator is the Custom Resource object which holds the current state of an operator. This object is used by operators to convey their state to the rest of the cluster.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "spec" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "clientSecret": { + "description": "ClientSecret is the oauth client secret", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.StringSource" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds configuration that could apply to any operator.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorSpec" + "legacy": { + "description": "Legacy determines if OAuth2 or OIDC should be used If true, OAuth2 is used If false, OIDC is used If nil and the URL's host is gitlab.com, OIDC is used Otherwise, OAuth2 is used In a future release, nil will default to using OIDC Eventually this flag will be removed and only OIDC will be used", + "type": "boolean" }, - "status": { - "description": "status holds the information about the state of an operator. It is consistent with status information across the Kubernetes ecosystem.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorStatus" + "url": { + "description": "URL is the oauth server base URL", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterOperator", - "Scope": "Clustered" + "Kind": "GitLabIdentityProvider", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterOperatorList": { - "description": "ClusterOperatorList is a list of OperatorStatus resources.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.GoogleIdentityProvider": { + "description": "GoogleIdentityProvider provides identities for users authenticating using Google credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "metadata", - "items" + "clientID", + "clientSecret", + "hostedDomain" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterOperator" - } + "clientID": { + "description": "ClientID is the oauth client ID", + "type": "string", + "default": "" + }, + "clientSecret": { + "description": "ClientSecret is the oauth client secret", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.StringSource" + }, + "hostedDomain": { + "description": "HostedDomain is the optional Google App domain (e.g. \"mycompany.com\") to restrict logins to", + "type": "string", + "default": "" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ClusterOperatorList", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ClusterOperatorSpec": { - "description": "ClusterOperatorSpec is empty for now, but you could imagine holding information like \"pause\".", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterOperatorSpec", + "Kind": "GoogleIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterOperatorStatus": { - "description": "ClusterOperatorStatus provides information about the status of the operator.", + "io.openshift.config.legacy.v1.GrantConfig": { + "description": "GrantConfig holds the necessary configuration options for grant handlers", "type": "object", + "required": [ + "method", + "serviceAccountMethod" + ], "properties": { - "conditions": { - "description": "conditions describes the state of the operator's managed and monitored components.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorStatusCondition" - }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "extension": { - "description": "extension contains any additional status information specific to the operator which owns this status object.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "relatedObjects": { - "description": "relatedObjects is a list of objects that are \"interesting\" or related to this operator. Common uses are: 1. the detailed resource driving the operator 2. operator namespaces 3. operand namespaces", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ObjectReference" - } + "method": { + "description": "Method determines the default strategy to use when an OAuth client requests a grant. This method will be used only if the specific OAuth client doesn't provide a strategy of their own. Valid grant handling methods are:\n - auto: always approves grant requests, useful for trusted clients\n - prompt: prompts the end user for approval of grant requests, useful for third-party clients\n - deny: always denies grant requests, useful for black-listed clients", + "type": "string", + "default": "" }, - "versions": { - "description": "versions is a slice of operator and operand version tuples. Operators which manage multiple operands will have multiple operand entries in the array. Available operators must report the version of the operator itself with the name \"operator\". An operator reports a new \"operator\" version when it has rolled out the new version to all of its operands.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OperandVersion" - } + "serviceAccountMethod": { + "description": "ServiceAccountMethod is used for determining client authorization for service account oauth client. It must be either: deny, prompt", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterOperatorStatus", + "Kind": "GrantConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterOperatorStatusCondition": { - "description": "ClusterOperatorStatusCondition represents the state of the operator's managed and monitored components.", + "io.openshift.config.legacy.v1.GroupResource": { + "description": "GroupResource points to a resource by its name and API group.", "type": "object", "required": [ - "type", - "status", - "lastTransitionTime" + "group", + "resource" ], "properties": { - "lastTransitionTime": { - "description": "lastTransitionTime is the time of the last update to the current status property.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { - "description": "message provides additional information about the current condition. This is only to be consumed by humans. It may contain Line Feed characters (U+000A), which should be rendered as new lines.", - "type": "string" - }, - "reason": { - "description": "reason is the CamelCase reason for the condition's current status.", - "type": "string" - }, - "status": { - "description": "status of the condition, one of True, False, Unknown.", + "group": { + "description": "Group is the name of an API group", "type": "string", "default": "" }, - "type": { - "description": "type specifies the aspect reported by this condition.", + "resource": { + "description": "Resource is the name of a resource.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterOperatorStatusCondition", + "Kind": "GroupResource", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterVersion": { - "description": "ClusterVersion is the configuration for the ClusterVersionOperator. This is where parameters related to automatic updates can be set.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.HTPasswdPasswordIdentityProvider": { + "description": "HTPasswdPasswordIdentityProvider provides identities for users authenticating using htpasswd credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "file" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "file": { + "description": "File is a reference to your htpasswd file", + "type": "string", + "default": "" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec is the desired state of the cluster version - the operator will work to ensure that the desired version is applied to the cluster.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionSpec" - }, - "status": { - "description": "status contains information about the available updates and any in-progress updates.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterVersion", - "Scope": "Clustered" + "Kind": "HTPasswdPasswordIdentityProvider", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterVersionCapabilitiesSpec": { - "description": "ClusterVersionCapabilitiesSpec selects the managed set of optional, core cluster components.", + "io.openshift.config.legacy.v1.HTTPServingInfo": { + "description": "HTTPServingInfo holds configuration for serving HTTP", "type": "object", + "required": [ + "bindAddress", + "bindNetwork", + "certFile", + "keyFile", + "clientCA", + "namedCertificates", + "maxRequestsInFlight", + "requestTimeoutSeconds" + ], "properties": { - "additionalEnabledCapabilities": { - "description": "additionalEnabledCapabilities extends the set of managed capabilities beyond the baseline defined in baselineCapabilitySet. The default is an empty set.", + "bindAddress": { + "description": "BindAddress is the ip:port to serve on", + "type": "string", + "default": "" + }, + "bindNetwork": { + "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", + "type": "string", + "default": "" + }, + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" + }, + "cipherSuites": { + "description": "CipherSuites contains an overridden list of ciphers for the server to support. Values must match cipher suite IDs from https://golang.org/pkg/crypto/tls/#pkg-constants", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "baselineCapabilitySet": { - "description": "baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities. If unset, the cluster will choose a default, and the default may change over time. The current default is vCurrent.", + "clientCA": { + "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" + }, + "maxRequestsInFlight": { + "description": "MaxRequestsInFlight is the number of concurrent requests allowed to the server. If zero, no limit.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "minTLSVersion": { + "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ClusterVersionCapabilitiesSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ClusterVersionCapabilitiesStatus": { - "description": "ClusterVersionCapabilitiesStatus describes the state of optional, core cluster components.", - "type": "object", - "properties": { - "enabledCapabilities": { - "description": "enabledCapabilities lists all the capabilities that are currently managed.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" }, - "knownCapabilities": { - "description": "knownCapabilities lists all the capabilities known to the current cluster.", + "namedCertificates": { + "description": "NamedCertificates is a list of certificates to use to secure requests to specific hostnames", "type": "array", "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.NamedCertificate" + } + }, + "requestTimeoutSeconds": { + "description": "RequestTimeoutSeconds is the number of seconds before requests are timed out. The default is 60 minutes, if -1 there is no limit on requests.", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterVersionCapabilitiesStatus", + "Kind": "HTTPServingInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterVersionList": { - "description": "ClusterVersionList is a list of ClusterVersion resources.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.IdentityProvider": { + "description": "IdentityProvider provides identities for users authenticating using credentials", "type": "object", "required": [ - "metadata", - "items" + "name", + "challenge", + "login", + "mappingMethod", + "provider" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "challenge": { + "description": "UseAsChallenger indicates whether to issue WWW-Authenticate challenges for this provider", + "type": "boolean", + "default": false }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterVersion" - } + "login": { + "description": "UseAsLogin indicates whether to use this identity provider for unauthenticated browsers to login against", + "type": "boolean", + "default": false }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "mappingMethod": { + "description": "MappingMethod determines how identities from this provider are mapped to users", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "name": { + "description": "Name is used to qualify the identities returned by this provider", + "type": "string", + "default": "" + }, + "provider": { + "description": "Provider contains the information about how to set up a specific identity provider", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterVersionList", + "Kind": "IdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterVersionSpec": { - "description": "ClusterVersionSpec is the desired version state of the cluster. It includes the version the cluster should be at, how the cluster is identified, and where the cluster should look for version updates.", + "io.openshift.config.legacy.v1.ImageConfig": { + "description": "ImageConfig holds the necessary configuration options for building image names for system components", "type": "object", "required": [ - "clusterID" + "format", + "latest" ], "properties": { - "capabilities": { - "description": "capabilities configures the installation of optional, core cluster components. A null value here is identical to an empty object; see the child properties for default semantics.", - "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionCapabilitiesSpec" - }, - "channel": { - "description": "channel is an identifier for explicitly requesting that a non-default set of updates be applied to this cluster. The default channel will be contain stable updates that are appropriate for production clusters.", - "type": "string" - }, - "clusterID": { - "description": "clusterID uniquely identifies this cluster. This is expected to be an RFC4122 UUID value (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx in hexadecimal values). This is a required field.", + "format": { + "description": "Format is the format of the name to be built for the system component", "type": "string", "default": "" }, - "desiredUpdate": { - "description": "desiredUpdate is an optional field that indicates the desired value of the cluster version. Setting this value will trigger an upgrade (if the current version does not match the desired version). The set of recommended update values is listed as part of available updates in status, and setting values outside that range may cause the upgrade to fail.\n\nSome of the fields are inter-related with restrictions and meanings described here. 1. image is specified, version is specified, architecture is specified. API validation error. 2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used. 3. image is specified, version is not specified, architecture is specified. API validation error. 4. image is specified, version is not specified, architecture is not specified. image is used. 5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image. 6. image is not specified, version is specified, architecture is not specified. version and current architecture are used to select an image. 7. image is not specified, version is not specified, architecture is specified. API validation error. 8. image is not specified, version is not specified, architecture is not specified. API validation error.\n\nIf an upgrade fails the operator will halt and report status about the failing component. Setting the desired update value back to the previous version will cause a rollback to be attempted. Not all rollbacks will succeed.", - "$ref": "#/definitions/io.openshift.config.v1.Update" - }, - "overrides": { - "description": "overrides is list of overides for components that are managed by cluster version operator. Marking a component unmanaged will prevent the operator from creating or updating the object.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ComponentOverride" - }, - "x-kubernetes-list-map-keys": [ - "kind", - "group", - "namespace", - "name" - ], - "x-kubernetes-list-type": "map" - }, - "signatureStores": { - "description": "signatureStores contains the upstream URIs to verify release signatures and optional reference to a config map by name containing the PEM-encoded CA bundle.\n\nBy default, CVO will use existing signature stores if this property is empty. The CVO will check the release signatures in the local ConfigMaps first. It will search for a valid signature in these stores in parallel only when local ConfigMaps did not include a valid signature. Validation will fail if none of the signature stores reply with valid signature before timeout. Setting signatureStores will replace the default signature stores with custom signature stores. Default stores can be used with custom signature stores by adding them manually.\n\nA maximum of 32 signature stores may be configured.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SignatureStore" - }, - "x-kubernetes-list-map-keys": [ - "url" - ], - "x-kubernetes-list-type": "map" - }, - "upstream": { - "description": "upstream may be used to specify the preferred update server. By default it will use the appropriate update server for the cluster and region.", - "type": "string" + "latest": { + "description": "Latest determines if the latest tag will be pulled from the registry", + "type": "boolean", + "default": false } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterVersionSpec", + "Kind": "ImageConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ClusterVersionStatus": { - "description": "ClusterVersionStatus reports the status of the cluster versioning, including any upgrades that are in progress. The current field will be set to whichever version the cluster is reconciling to, and the conditions array will report whether the update succeeded, is in progress, or is failing.", + "io.openshift.config.legacy.v1.ImagePolicyConfig": { + "description": "ImagePolicyConfig holds the necessary configuration options for limits and behavior for importing images", "type": "object", "required": [ - "desired", - "observedGeneration", - "versionHash", - "capabilities", - "availableUpdates" + "maxImagesBulkImportedPerRepository", + "disableScheduledImport", + "scheduledImageImportMinimumIntervalSeconds", + "maxScheduledImageImportsPerMinute" ], "properties": { - "availableUpdates": { - "description": "availableUpdates contains updates recommended for this cluster. Updates which appear in conditionalUpdates but not in availableUpdates may expose this cluster to known issues. This list may be empty if no updates are recommended, if the update service is unavailable, or if an invalid channel has been specified.", + "additionalTrustedCA": { + "description": "AdditionalTrustedCA is a path to a pem bundle file containing additional CAs that should be trusted during imagestream import.", + "type": "string" + }, + "allowedRegistriesForImport": { + "description": "AllowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Release" - }, - "x-kubernetes-list-type": "atomic" + "$ref": "#/definitions/io.openshift.config.legacy.v1.RegistryLocation" + } }, - "capabilities": { - "description": "capabilities describes the state of optional, core cluster components.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionCapabilitiesStatus" + "disableScheduledImport": { + "description": "DisableScheduledImport allows scheduled background import of images to be disabled.", + "type": "boolean", + "default": false }, - "conditionalUpdates": { - "description": "conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConditionalUpdate" - }, - "x-kubernetes-list-type": "atomic" + "externalRegistryHostname": { + "description": "ExternalRegistryHostname sets the hostname for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "type": "string" }, - "conditions": { - "description": "conditions provides information about the cluster version. The condition \"Available\" is set to true if the desiredUpdate has been reached. The condition \"Progressing\" is set to true if an update is being applied. The condition \"Degraded\" is set to true if an update is currently blocked by a temporary or permanent error. Conditions are only valid for the current desiredUpdate when metadata.generation is equal to status.generation.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorStatusCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "internalRegistryHostname": { + "description": "InternalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.", + "type": "string" }, - "desired": { - "description": "desired is the version that the cluster is reconciling towards. If the cluster is not yet fully initialized desired will be set with the information available, which may be an image or a tag.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Release" + "maxImagesBulkImportedPerRepository": { + "description": "MaxImagesBulkImportedPerRepository controls the number of images that are imported when a user does a bulk import of a container repository. This number defaults to 50 to prevent users from importing large numbers of images accidentally. Set -1 for no limit.", + "type": "integer", + "format": "int32", + "default": 0 }, - "history": { - "description": "history contains a list of the most recent versions applied to the cluster. This value may be empty during cluster startup, and then will be updated when a new update is being applied. The newest update is first in the list and it is ordered by recency. Updates in the history have state Completed if the rollout completed - if an update was failing or halfway applied the state will be Partial. Only a limited amount of update history is preserved.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.UpdateHistory" - }, - "x-kubernetes-list-type": "atomic" + "maxScheduledImageImportsPerMinute": { + "description": "MaxScheduledImageImportsPerMinute is the maximum number of scheduled image streams that will be imported in the background per minute. The default value is 60. Set to -1 for unlimited.", + "type": "integer", + "format": "int32", + "default": 0 }, - "observedGeneration": { - "description": "observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent a previous version.", + "scheduledImageImportMinimumIntervalSeconds": { + "description": "ScheduledImageImportMinimumIntervalSeconds is the minimum number of seconds that can elapse between when image streams scheduled for background import are checked against the upstream repository. The default value is 15 minutes.", "type": "integer", - "format": "int64", + "format": "int32", "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "legacy.config.openshift.io", + "Version": "v1", + "Kind": "ImagePolicyConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.legacy.v1.JenkinsPipelineConfig": { + "description": "JenkinsPipelineConfig holds configuration for the Jenkins pipeline strategy", + "type": "object", + "required": [ + "autoProvisionEnabled", + "templateNamespace", + "templateName", + "serviceName", + "parameters" + ], + "properties": { + "autoProvisionEnabled": { + "description": "AutoProvisionEnabled determines whether a Jenkins server will be spawned from the provided template when the first build config in the project with type JenkinsPipeline is created. When not specified this option defaults to true.", + "type": "boolean" }, - "versionHash": { - "description": "versionHash is a fingerprint of the content that the cluster will be updated with. It is used by the operator to avoid unnecessary work and is for internal use only.", + "parameters": { + "description": "Parameters specifies a set of optional parameters to the Jenkins template.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "serviceName": { + "description": "ServiceName is the name of the Jenkins service OpenShift uses to detect whether a Jenkins pipeline handler has already been installed in a project. This value *must* match a service name in the provided template.", + "type": "string", + "default": "" + }, + "templateName": { + "description": "TemplateName is the name of the default Jenkins template", + "type": "string", + "default": "" + }, + "templateNamespace": { + "description": "TemplateNamespace contains the namespace name where the Jenkins template is stored", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ClusterVersionStatus", + "Kind": "JenkinsPipelineConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ComponentOverride": { - "description": "ComponentOverride allows overriding cluster version operator's behavior for a component.", + "io.openshift.config.legacy.v1.KeystonePasswordIdentityProvider": { + "description": "KeystonePasswordIdentityProvider provides identities for users authenticating using keystone password credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "kind", - "group", - "namespace", - "name", - "unmanaged" + "url", + "ca", + "certFile", + "keyFile", + "domainName", + "useKeystoneIdentity" ], "properties": { - "group": { - "description": "group identifies the API group that the kind is in.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "ca": { + "description": "CA is the CA for verifying TLS connections", "type": "string", "default": "" }, - "kind": { - "description": "kind indentifies which object to override.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "name": { - "description": "name is the component's name.", + "domainName": { + "description": "Domain Name is required for keystone v3", "type": "string", "default": "" }, - "namespace": { - "description": "namespace is the component's namespace. If the resource is cluster scoped, the namespace should be empty.", + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" }, - "unmanaged": { - "description": "unmanaged controls if cluster version operator should stop managing the resources in this cluster. Default: false", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "url": { + "description": "URL is the remote URL to connect to", + "type": "string", + "default": "" + }, + "useKeystoneIdentity": { + "description": "UseKeystoneIdentity flag indicates that user should be authenticated by keystone ID, not by username", "type": "boolean", "default": false } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ComponentOverride", + "Kind": "KeystonePasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ComponentRouteSpec": { - "description": "ComponentRouteSpec allows for configuration of a route's hostname and serving certificate.", + "io.openshift.config.legacy.v1.KubeletConnectionInfo": { + "description": "KubeletConnectionInfo holds information necessary for connecting to a kubelet", "type": "object", "required": [ - "namespace", - "name", - "hostname" + "port", + "ca", + "certFile", + "keyFile" ], "properties": { - "hostname": { - "description": "hostname is the hostname that should be used by the route.", + "ca": { + "description": "CA is the CA for verifying TLS connections to kubelets", "type": "string", "default": "" }, - "name": { - "description": "name is the logical name of the route to customize.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of status.componentRoutes if the route is to be customized.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "namespace": { - "description": "namespace is the namespace of the route to customize.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of status.componentRoutes if the route is to be customized.", + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" }, - "servingCertKeyPairSecret": { - "description": "servingCertKeyPairSecret is a reference to a secret of type `kubernetes.io/tls` in the openshift-config namespace. The serving cert/key pair must match and will be used by the operator to fulfill the intent of serving with this name. If the custom hostname uses the default routing suffix of the cluster, the Secret specification for a serving certificate will not be needed.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "port": { + "description": "Port is the port to connect to kubelets on", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ComponentRouteSpec", + "Kind": "KubeletConnectionInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ComponentRouteStatus": { - "description": "ComponentRouteStatus contains information allowing configuration of a route's hostname and serving certificate.", + "io.openshift.config.legacy.v1.KubernetesMasterConfig": { + "description": "KubernetesMasterConfig holds the necessary configuration options for the Kubernetes master", "type": "object", "required": [ - "namespace", - "name", - "defaultHostname", - "relatedObjects" + "apiLevels", + "disabledAPIGroupVersions", + "masterIP", + "masterEndpointReconcileTTL", + "servicesSubnet", + "servicesNodePortRange", + "schedulerConfigFile", + "podEvictionTimeout", + "proxyClientInfo", + "apiServerArguments", + "controllerArguments", + "schedulerArguments" ], "properties": { - "conditions": { - "description": "conditions are used to communicate the state of the componentRoutes entry.\n\nSupported conditions include Available, Degraded and Progressing.\n\nIf available is true, the content served by the route can be accessed by users. This includes cases where a default may continue to serve content while the customized route specified by the cluster-admin is being configured.\n\nIf Degraded is true, that means something has gone wrong trying to handle the componentRoutes entry. The currentHostnames field may or may not be in effect.\n\nIf Progressing is true, that means the component is taking some action related to the componentRoutes entry.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "consumingUsers": { - "description": "consumingUsers is a slice of ServiceAccounts that need to have read permission on the servingCertKeyPairSecret secret.", + "apiLevels": { + "description": "APILevels is a list of API levels that should be enabled on startup: v1 as examples", "type": "array", "items": { "type": "string", "default": "" } }, - "currentHostnames": { - "description": "currentHostnames is the list of current names used by the route. Typically, this list should consist of a single hostname, but if multiple hostnames are supported by the route the operator may write multiple entries to this list.", - "type": "array", - "items": { - "type": "string", - "default": "" + "apiServerArguments": { + "description": "APIServerArguments are key value pairs that will be passed directly to the Kube apiserver that match the apiservers's command line arguments. These are not migrated, but if you reference a value that does not exist the server will not start. These values may override other settings in KubernetesMasterConfig which may cause invalid configurations.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, - "defaultHostname": { - "description": "defaultHostname is the hostname of this route prior to customization.", + "controllerArguments": { + "description": "ControllerArguments are key value pairs that will be passed directly to the Kube controller manager that match the controller manager's command line arguments. These are not migrated, but if you reference a value that does not exist the server will not start. These values may override other settings in KubernetesMasterConfig which may cause invalid configurations.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "disabledAPIGroupVersions": { + "description": "DisabledAPIGroupVersions is a map of groups to the versions (or *) that should be disabled.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "masterEndpointReconcileTTL": { + "description": "MasterEndpointReconcileTTL sets the time to live in seconds of an endpoint record recorded by each master. The endpoints are checked at an interval that is 2/3 of this value and this value defaults to 15s if unset. In very large clusters, this value may be increased to reduce the possibility that the master endpoint record expires (due to other load on the etcd server) and causes masters to drop in and out of the kubernetes service record. It is not recommended to set this value below 15s.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "masterIP": { + "description": "MasterIP is the public IP address of kubernetes stuff. If empty, the first result from net.InterfaceAddrs will be used.", "type": "string", "default": "" }, - "name": { - "description": "name is the logical name of the route to customize. It does not have to be the actual name of a route resource but it cannot be renamed.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of spec.componentRoutes if the route is to be customized.", + "podEvictionTimeout": { + "description": "PodEvictionTimeout controls grace period for deleting pods on failed nodes. It takes valid time duration string. If empty, you get the default pod eviction timeout.", "type": "string", "default": "" }, - "namespace": { - "description": "namespace is the namespace of the route to customize. It must be a real namespace. Using an actual namespace ensures that no two components will conflict and the same component can be installed multiple times.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of spec.componentRoutes if the route is to be customized.", + "proxyClientInfo": { + "description": "ProxyClientInfo specifies the client cert/key to use when proxying to pods", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.CertInfo" + }, + "schedulerArguments": { + "description": "SchedulerArguments are key value pairs that will be passed directly to the Kube scheduler that match the scheduler's command line arguments. These are not migrated, but if you reference a value that does not exist the server will not start. These values may override other settings in KubernetesMasterConfig which may cause invalid configurations.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "schedulerConfigFile": { + "description": "SchedulerConfigFile points to a file that describes how to set up the scheduler. If empty, you get the default scheduling rules.", "type": "string", "default": "" }, - "relatedObjects": { - "description": "relatedObjects is a list of resources which are useful when debugging or inspecting how spec.componentRoutes is applied.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ObjectReference" - } + "servicesNodePortRange": { + "description": "ServicesNodePortRange is the range to use for assigning service public ports on a host.", + "type": "string", + "default": "" + }, + "servicesSubnet": { + "description": "ServicesSubnet is the subnet to use for assigning service IPs", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ComponentRouteStatus", + "Kind": "KubernetesMasterConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ConditionalUpdate": { - "description": "ConditionalUpdate represents an update which is recommended to some clusters on the version the current cluster is reconciling, but which may not be recommended for the current cluster.", + "io.openshift.config.legacy.v1.LDAPAttributeMapping": { + "description": "LDAPAttributeMapping maps LDAP attributes to OpenShift identity fields", "type": "object", "required": [ - "release", - "risks" + "id", + "preferredUsername", + "name", + "email" ], "properties": { - "conditions": { - "description": "conditions represents the observations of the conditional update's current status. Known types are: * Recommended, for whether the update is recommended for the current cluster.", + "email": { + "description": "Email is the list of attributes whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "type": "string", + "default": "" + } }, - "release": { - "description": "release is the target of the update.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Release" + "id": { + "description": "ID is the list of attributes whose values should be used as the user ID. Required. LDAP standard identity attribute is \"dn\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "risks": { - "description": "risks represents the range of issues associated with updating to the target release. The cluster-version operator will evaluate all entries, and only recommend the update if there is at least one entry and all entries recommend the update.", + "name": { + "description": "Name is the list of attributes whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity LDAP standard display name attribute is \"cn\"", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConditionalUpdateRisk" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "name", - "x-kubernetes-patch-strategy": "merge" + "type": "string", + "default": "" + } + }, + "preferredUsername": { + "description": "PreferredUsername is the list of attributes whose values should be used as the preferred username. LDAP standard login attribute is \"uid\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ConditionalUpdate", + "Kind": "LDAPAttributeMapping", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ConditionalUpdateRisk": { - "description": "ConditionalUpdateRisk represents a reason and cluster-state for not recommending a conditional update.", + "io.openshift.config.legacy.v1.LDAPPasswordIdentityProvider": { + "description": "LDAPPasswordIdentityProvider provides identities for users authenticating using LDAP credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "url", - "name", - "message", - "matchingRules" + "bindDN", + "bindPassword", + "insecure", + "ca", + "attributes" ], "properties": { - "matchingRules": { - "description": "matchingRules is a slice of conditions for deciding which clusters match the risk and which do not. The slice is ordered by decreasing precedence. The cluster-version operator will walk the slice in order, and stop after the first it can successfully evaluate. If no condition can be successfully evaluated, the update will not be recommended.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterCondition" - }, - "x-kubernetes-list-type": "atomic" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "message": { - "description": "message provides additional information about the risk of updating, in the event that matchingRules match the cluster state. This is only to be consumed by humans. It may contain Line Feed characters (U+000A), which should be rendered as new lines.", + "attributes": { + "description": "Attributes maps LDAP attributes to identities", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LDAPAttributeMapping" + }, + "bindDN": { + "description": "BindDN is an optional DN to bind with during the search phase.", "type": "string", "default": "" }, - "name": { - "description": "name is the CamelCase reason for not recommending a conditional update, in the event that matchingRules match the cluster state.", + "bindPassword": { + "description": "BindPassword is an optional password to bind with during the search phase.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.StringSource" + }, + "ca": { + "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", "type": "string", "default": "" }, - "url": { - "description": "url contains information about this risk.", + "insecure": { + "description": "Insecure, if true, indicates the connection should not use TLS. Cannot be set to true with a URL scheme of \"ldaps://\" If false, \"ldaps://\" URLs connect using TLS, and \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830", + "type": "boolean", + "default": false + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "url": { + "description": "URL is an RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is\n ldap://host:port/basedn?attribute?scope?filter", "type": "string", "default": "" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ConditionalUpdateRisk", + "Kind": "LDAPPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ConfigMapFileReference": { - "description": "ConfigMapFileReference references a config map in a specific namespace. The namespace must be specified at the point of use.", + "io.openshift.config.legacy.v1.LDAPQuery": { + "description": "LDAPQuery holds the options necessary to build an LDAP query", "type": "object", "required": [ - "name" + "baseDN", + "scope", + "derefAliases", + "timeout", + "filter", + "pageSize" ], "properties": { - "key": { - "description": "Key allows pointing to a specific key/value inside of the configmap. This is useful for logical file references.", - "type": "string" + "baseDN": { + "description": "The DN of the branch of the directory where all searches should start from", + "type": "string", + "default": "" }, - "name": { + "derefAliases": { + "description": "The (optional) behavior of the search with regards to alisases. Can be: never: never dereference aliases, search: only dereference in searching, base: only dereference in finding the base object, always: always dereference Defaults to always dereferencing if not set", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ConfigMapFileReference", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ConfigMapNameReference": { - "description": "ConfigMapNameReference references a config map in a specific namespace. The namespace must be specified at the point of use.", - "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "description": "name is the metadata.name of the referenced config map", + }, + "filter": { + "description": "Filter is a valid LDAP search filter that retrieves all relevant entries from the LDAP server with the base DN", + "type": "string", + "default": "" + }, + "pageSize": { + "description": "PageSize is the maximum preferred page size, measured in LDAP entries. A page size of 0 means no paging will be done.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "scope": { + "description": "The (optional) scope of the search. Can be: base: only the base object, one: all object on the base level, sub: the entire subtree Defaults to the entire subtree if not set", "type": "string", "default": "" + }, + "timeout": { + "description": "TimeLimit holds the limit of time in seconds that any request to the server can remain outstanding before the wait for a response is given up. If this is 0, no client-side limit is imposed", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ConfigMapNameReference", + "Kind": "LDAPQuery", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Console": { - "description": "Console holds cluster-wide configuration for the web console, including the logout URL, and reports the public URL of the console. The canonical name is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.LDAPSyncConfig": { + "description": "LDAPSyncConfig holds the necessary configuration options to define an LDAP group sync\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "url", + "bindDN", + "bindPassword", + "insecure", + "ca", + "groupUIDNameMapping" ], "properties": { + "activeDirectory": { + "description": "ActiveDirectoryConfig holds the configuration for extracting data from an LDAP server set up in a fashion similar to that used in Active Directory: first-class user entries, with group membership determined by a multi-valued attribute on members listing groups they are a member of", + "$ref": "#/definitions/io.openshift.config.legacy.v1.ActiveDirectoryConfig" + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "augmentedActiveDirectory": { + "description": "AugmentedActiveDirectoryConfig holds the configuration for extracting data from an LDAP server set up in a fashion similar to that used in Active Directory as described above, with one addition: first-class group entries exist and are used to hold metadata but not group membership", + "$ref": "#/definitions/io.openshift.config.legacy.v1.AugmentedActiveDirectoryConfig" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "bindDN": { + "description": "BindDN is an optional DN to bind to the LDAP server with", + "type": "string", + "default": "" }, - "spec": { - "description": "spec holds user settable values for configuration", + "bindPassword": { + "description": "BindPassword is an optional password to bind with during the search phase.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConsoleSpec" + "$ref": "#/definitions/io.openshift.config.legacy.v1.StringSource" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConsoleStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "Console", - "Scope": "Clustered" - } - }, - "io.openshift.config.v1.ConsoleAuthentication": { - "description": "ConsoleAuthentication defines a list of optional configuration for console authentication.", - "type": "object", - "properties": { - "logoutRedirect": { - "description": "An optional, absolute URL to redirect web browsers to after logging out of the console. If not specified, it will redirect to the default login page. This is required when using an identity provider that supports single sign-on (SSO) such as: - OpenID (Keycloak, Azure) - RequestHeader (GSSAPI, SSPI, SAML) - OAuth (GitHub, GitLab, Google) Logging out of the console will destroy the user's token. The logoutRedirect provides the user the option to perform single logout (SLO) through the identity provider to destroy their single sign-on session.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ConsoleAuthentication", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ConsoleList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "ca": { + "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", + "type": "string", + "default": "" }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Console" + "groupUIDNameMapping": { + "description": "LDAPGroupUIDToOpenShiftGroupNameMapping is an optional direct mapping of LDAP group UIDs to OpenShift Group names", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" } }, + "insecure": { + "description": "Insecure, if true, indicates the connection should not use TLS. Cannot be set to true with a URL scheme of \"ldaps://\" If false, \"ldaps://\" URLs connect using TLS, and \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830", + "type": "boolean", + "default": false + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "rfc2307": { + "description": "RFC2307Config holds the configuration for extracting data from an LDAP server set up in a fashion similar to RFC2307: first-class group and user entries, with group membership determined by a multi-valued attribute on the group entry listing its members", + "$ref": "#/definitions/io.openshift.config.legacy.v1.RFC2307Config" + }, + "url": { + "description": "Host is the scheme, host and port of the LDAP server to connect to: scheme://host:port", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ConsoleList", + "Kind": "LDAPSyncConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ConsoleSpec": { - "description": "ConsoleSpec is the specification of the desired behavior of the Console.", + "io.openshift.config.legacy.v1.LocalQuota": { + "description": "LocalQuota contains options for controlling local volume quota on the node.", "type": "object", + "required": [ + "perFSGroup" + ], "properties": { - "authentication": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConsoleAuthentication" + "perFSGroup": { + "description": "FSGroup can be specified to enable a quota on local storage use per unique FSGroup ID. At present this is only implemented for emptyDir volumes, and if the underlying volumeDirectory is on an XFS filesystem.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ConsoleSpec", + "Kind": "LocalQuota", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ConsoleStatus": { - "description": "ConsoleStatus defines the observed status of the Console.", + "io.openshift.config.legacy.v1.MasterAuthConfig": { + "description": "MasterAuthConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", "type": "object", "required": [ - "consoleURL" + "requestHeader", + "webhookTokenAuthenticators", + "oauthMetadataFile" ], "properties": { - "consoleURL": { - "description": "The URL for the console. This will be derived from the host for the route that is created for the console.", + "oauthMetadataFile": { + "description": "OAuthMetadataFile is a path to a file containing the discovery endpoint for OAuth 2.0 Authorization Server Metadata for an external OAuth server. See IETF Draft: // https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 This option is mutually exclusive with OAuthConfig", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ConsoleStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.CustomFeatureGates": { - "type": "object", - "properties": { - "disabled": { - "description": "disabled is a list of all feature gates that you want to force off", - "type": "array", - "items": { - "type": "string", - "default": "" - } }, - "enabled": { - "description": "enabled is a list of all feature gates that you want to force on", + "requestHeader": { + "description": "RequestHeader holds options for setting up a front proxy against the API. It is optional.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.RequestHeaderAuthenticationOptions" + }, + "webhookTokenAuthenticators": { + "description": "WebhookTokenAuthnConfig, if present configures remote token reviewers", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.WebhookTokenAuthenticator" } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "CustomFeatureGates", + "Kind": "MasterAuthConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.CustomTLSProfile": { - "description": "CustomTLSProfile is a user-defined TLS security profile. Be extremely careful using a custom TLS profile as invalid configurations can be catastrophic.", + "io.openshift.config.legacy.v1.MasterClients": { + "description": "MasterClients holds references to `.kubeconfig` files that qualify master clients for OpenShift and Kubernetes", "type": "object", "required": [ - "ciphers", - "minTLSVersion" + "openshiftLoopbackKubeConfig", + "openshiftLoopbackClientConnectionOverrides" ], "properties": { - "ciphers": { - "description": "ciphers is used to specify the cipher algorithms that are negotiated during the TLS handshake. Operators may remove entries their operands do not support. For example, to use DES-CBC3-SHA (yaml):\n\n ciphers:\n - DES-CBC3-SHA", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "openshiftLoopbackClientConnectionOverrides": { + "description": "OpenShiftLoopbackClientConnectionOverrides specifies client overrides for system components to loop back to this master.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.ClientConnectionOverrides" }, - "minTLSVersion": { - "description": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n minTLSVersion: VersionTLS11\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12", + "openshiftLoopbackKubeConfig": { + "description": "OpenShiftLoopbackKubeConfig is a .kubeconfig filename for system components to loopback to this master", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "CustomTLSProfile", + "Kind": "MasterClients", "Scope": "Namespaced" } }, - "io.openshift.config.v1.DNS": { - "description": "DNS holds cluster-wide information about DNS. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.MasterConfig": { + "description": "MasterConfig holds the necessary configuration options for the OpenShift master\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "servingInfo", + "authConfig", + "aggregatorConfig", + "corsAllowedOrigins", + "apiLevels", + "masterPublicURL", + "controllers", + "admissionConfig", + "controllerConfig", + "etcdStorageConfig", + "etcdClientInfo", + "kubeletClientInfo", + "kubernetesMasterConfig", + "etcdConfig", + "oauthConfig", + "dnsConfig", + "serviceAccountConfig", + "masterClients", + "imageConfig", + "imagePolicyConfig", + "policyConfig", + "projectConfig", + "routingConfig", + "networkConfig", + "volumeConfig", + "jenkinsPipelineConfig", + "auditConfig" ], "properties": { + "admissionConfig": { + "description": "AdmissionConfig contains admission control plugin configuration.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.AdmissionConfig" + }, + "aggregatorConfig": { + "description": "AggregatorConfig has options for configuring the aggregator component of the API server.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.AggregatorConfig" + }, + "apiLevels": { + "description": "APILevels is a list of API levels that should be enabled on startup: v1 as examples", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "auditConfig": { + "description": "AuditConfig holds information related to auditing capabilities.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.AuditConfig" + }, + "authConfig": { + "description": "AuthConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.MasterAuthConfig" + }, + "controllerConfig": { + "description": "ControllerConfig holds configuration values for controllers", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ControllerConfig" + }, + "controllers": { + "description": "Controllers is a list of the controllers that should be started. If set to \"none\", no controllers will start automatically. The default value is \"*\" which will start all controllers. When using \"*\", you may exclude controllers by prepending a \"-\" in front of their name. No other values are recognized at this time.", + "type": "string", + "default": "" + }, + "corsAllowedOrigins": { + "description": "CORSAllowedOrigins", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "dnsConfig": { + "description": "DNSConfig, if present start the DNS server in this process", + "$ref": "#/definitions/io.openshift.config.legacy.v1.DNSConfig" + }, + "etcdClientInfo": { + "description": "EtcdClientInfo contains information about how to connect to etcd", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.EtcdConnectionInfo" + }, + "etcdConfig": { + "description": "EtcdConfig, if present start etcd in this process", + "$ref": "#/definitions/io.openshift.config.legacy.v1.EtcdConfig" + }, + "etcdStorageConfig": { + "description": "EtcdStorageConfig contains information about how API resources are stored in Etcd. These values are only relevant when etcd is the backing store for the cluster.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.EtcdStorageConfig" + }, + "imageConfig": { + "description": "ImageConfig holds options that describe how to build image names for system components", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ImageConfig" + }, + "imagePolicyConfig": { + "description": "ImagePolicyConfig controls limits and behavior for importing images", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ImagePolicyConfig" + }, + "jenkinsPipelineConfig": { + "description": "JenkinsPipelineConfig holds information about the default Jenkins template used for JenkinsPipeline build strategy.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.JenkinsPipelineConfig" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "kubeletClientInfo": { + "description": "KubeletClientInfo contains information about how to connect to kubelets", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.legacy.v1.KubeletConnectionInfo" }, - "spec": { - "description": "spec holds user settable values for configuration", + "kubernetesMasterConfig": { + "description": "KubernetesMasterConfig, if present start the kubernetes master in this process", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DNSSpec" + "$ref": "#/definitions/io.openshift.config.legacy.v1.KubernetesMasterConfig" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "masterClients": { + "description": "MasterClients holds all the client connection information for controllers and other system components", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DNSStatus" + "$ref": "#/definitions/io.openshift.config.legacy.v1.MasterClients" + }, + "masterPublicURL": { + "description": "MasterPublicURL is how clients can access the OpenShift API server", + "type": "string", + "default": "" + }, + "networkConfig": { + "description": "NetworkConfig to be passed to the compiled in network plugin", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.MasterNetworkConfig" + }, + "oauthConfig": { + "description": "OAuthConfig, if present start the /oauth endpoint in this process", + "$ref": "#/definitions/io.openshift.config.legacy.v1.OAuthConfig" + }, + "policyConfig": { + "description": "PolicyConfig holds information about where to locate critical pieces of bootstrapping policy", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.PolicyConfig" + }, + "projectConfig": { + "description": "ProjectConfig holds information about project creation and defaults", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ProjectConfig" + }, + "routingConfig": { + "description": "RoutingConfig holds information about routing and route generation", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.RoutingConfig" + }, + "serviceAccountConfig": { + "description": "ServiceAccountConfig holds options related to service accounts", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ServiceAccountConfig" + }, + "servingInfo": { + "description": "ServingInfo describes how to start serving", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.HTTPServingInfo" + }, + "volumeConfig": { + "description": "MasterVolumeConfig contains options for configuring volume plugins in the master node.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.MasterVolumeConfig" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "DNS", - "Scope": "Clustered" + "Kind": "MasterConfig", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.DNSList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.MasterNetworkConfig": { + "description": "MasterNetworkConfig to be passed to the compiled in network plugin", "type": "object", "required": [ - "metadata", - "items" + "networkPluginName", + "clusterNetworks", + "serviceNetworkCIDR", + "externalIPNetworkCIDRs", + "ingressIPNetworkCIDR" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "clusterNetworkCIDR": { + "description": "ClusterNetworkCIDR is the CIDR string to specify the global overlay network's L3 space. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.", "type": "string" }, - "items": { + "clusterNetworks": { + "description": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then ClusterNetworkCIDR and HostSubnetLength may not be set.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DNS" + "$ref": "#/definitions/io.openshift.config.legacy.v1.ClusterNetworkEntry" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "externalIPNetworkCIDRs": { + "description": "ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP may be set. It may contain a list of CIDRs which are checked for access. If a CIDR is prefixed with !, IPs in that CIDR will be rejected. Rejections will be applied first, then the IP checked against one of the allowed CIDRs. You should ensure this range does not overlap with your nodes, pods, or service CIDRs for security reasons.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "hostSubnetLength": { + "description": "HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.", + "type": "integer", + "format": "int64" + }, + "ingressIPNetworkCIDR": { + "description": "IngressIPNetworkCIDR controls the range to assign ingress ips from for services of type LoadBalancer on bare metal. If empty, ingress ips will not be assigned. It may contain a single CIDR that will be allocated from. For security reasons, you should ensure that this range does not overlap with the CIDRs reserved for external ips, nodes, pods, or services.", + "type": "string", + "default": "" + }, + "networkPluginName": { + "description": "NetworkPluginName is the name of the network plugin to use", + "type": "string", + "default": "" + }, + "serviceNetworkCIDR": { + "description": "ServiceNetwork is the CIDR string to specify the service networks", + "type": "string", + "default": "" + }, + "vxlanPort": { + "description": "VXLANPort is the VXLAN port used by the cluster defaults. If it is not set, 4789 is the default value", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "DNSList", + "Kind": "MasterNetworkConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.DNSPlatformSpec": { - "description": "DNSPlatformSpec holds cloud-provider-specific configuration for DNS administration.", + "io.openshift.config.legacy.v1.MasterVolumeConfig": { + "description": "MasterVolumeConfig contains options for configuring volume plugins in the master node.", "type": "object", "required": [ - "type" + "dynamicProvisioningEnabled" ], "properties": { - "aws": { - "description": "aws contains DNS configuration specific to the Amazon Web Services cloud provider.", - "$ref": "#/definitions/io.openshift.config.v1.AWSDNSSpec" - }, - "type": { - "description": "type is the underlying infrastructure provider for the cluster. Allowed values: \"\", \"AWS\".\n\nIndividual components may not support all platforms, and must handle unrecognized platforms with best-effort defaults.", - "type": "string", - "default": "" + "dynamicProvisioningEnabled": { + "description": "DynamicProvisioningEnabled is a boolean that toggles dynamic provisioning off when false, defaults to true", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "DNSPlatformSpec", + "Kind": "MasterVolumeConfig", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "aws": "AWS" - } - } - ] + } }, - "io.openshift.config.v1.DNSSpec": { + "io.openshift.config.legacy.v1.NamedCertificate": { + "description": "NamedCertificate specifies a certificate/key, and the names it should be served for", "type": "object", "required": [ - "baseDomain" + "names", + "certFile", + "keyFile" ], "properties": { - "baseDomain": { - "description": "baseDomain is the base domain of the cluster. All managed DNS records will be sub-domains of this base.\n\nFor example, given the base domain `openshift.example.com`, an API server DNS record may be created for `cluster-api.openshift.example.com`.\n\nOnce set, this field cannot be changed.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "platform": { - "description": "platform holds configuration specific to the underlying infrastructure provider for DNS. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DNSPlatformSpec" - }, - "privateZone": { - "description": "privateZone is the location where all the DNS records that are only available internally to the cluster exist.\n\nIf this field is nil, no private records should be created.\n\nOnce set, this field cannot be changed.", - "$ref": "#/definitions/io.openshift.config.v1.DNSZone" - }, - "publicZone": { - "description": "publicZone is the location where all the DNS records that are publicly accessible to the internet exist.\n\nIf this field is nil, no public records should be created.\n\nOnce set, this field cannot be changed.", - "$ref": "#/definitions/io.openshift.config.v1.DNSZone" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "DNSSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.DNSStatus": { - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "DNSStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.DNSZone": { - "description": "DNSZone is used to define a DNS hosted zone. A zone can be identified by an ID or tags.", - "type": "object", - "properties": { - "id": { - "description": "id is the identifier that can be used to find the DNS hosted zone.\n\non AWS zone can be fetched using `ID` as id in [1] on Azure zone can be fetched using `ID` as a pre-determined name in [2], on GCP zone can be fetched using `ID` as a pre-determined name in [3].\n\n[1]: https://docs.aws.amazon.com/cli/latest/reference/route53/get-hosted-zone.html#options [2]: https://docs.microsoft.com/en-us/cli/azure/network/dns/zone?view=azure-cli-latest#az-network-dns-zone-show [3]: https://cloud.google.com/dns/docs/reference/v1/managedZones/get", - "type": "string" + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" }, - "tags": { - "description": "tags can be used to query the DNS hosted zone.\n\non AWS, resourcegroupstaggingapi [1] can be used to fetch a zone using `Tags` as tag-filters,\n\n[1]: https://docs.aws.amazon.com/cli/latest/reference/resourcegroupstaggingapi/get-resources.html#options", - "type": "object", - "additionalProperties": { + "names": { + "description": "Names is a list of DNS names this certificate should be used to secure A name can be a normal DNS name, or can contain leading wildcard segments.", + "type": "array", + "items": { "type": "string", "default": "" } @@ -19357,910 +19551,1042 @@ }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "DNSZone", + "Kind": "NamedCertificate", "Scope": "Namespaced" } }, - "io.openshift.config.v1.DelegatedAuthentication": { - "description": "DelegatedAuthentication allows authentication to be disabled.", + "io.openshift.config.legacy.v1.NodeAuthConfig": { + "description": "NodeAuthConfig holds authn/authz configuration options", "type": "object", + "required": [ + "authenticationCacheTTL", + "authenticationCacheSize", + "authorizationCacheTTL", + "authorizationCacheSize" + ], "properties": { - "disabled": { - "description": "disabled indicates that authentication should be disabled. By default it will use delegated authentication.", - "type": "boolean" + "authenticationCacheSize": { + "description": "AuthenticationCacheSize indicates how many authentication results should be cached. If 0, the default cache size is used.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "authenticationCacheTTL": { + "description": "AuthenticationCacheTTL indicates how long an authentication result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get the default timeout. If zero (e.g. \"0m\"), caching is disabled", + "type": "string", + "default": "" + }, + "authorizationCacheSize": { + "description": "AuthorizationCacheSize indicates how many authorization results should be cached. If 0, the default cache size is used.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "authorizationCacheTTL": { + "description": "AuthorizationCacheTTL indicates how long an authorization result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get the default timeout. If zero (e.g. \"0m\"), caching is disabled", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "DelegatedAuthentication", + "Kind": "NodeAuthConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.DelegatedAuthorization": { - "description": "DelegatedAuthorization allows authorization to be disabled.", + "io.openshift.config.legacy.v1.NodeConfig": { + "description": "NodeConfig is the fully specified config starting an OpenShift node\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "nodeName", + "nodeIP", + "servingInfo", + "masterKubeConfig", + "masterClientConnectionOverrides", + "dnsDomain", + "dnsIP", + "dnsBindAddress", + "dnsNameservers", + "dnsRecursiveResolvConf", + "networkConfig", + "volumeDirectory", + "imageConfig", + "allowDisabledDocker", + "podManifestConfig", + "authConfig", + "dockerConfig", + "iptablesSyncPeriod", + "enableUnidling", + "volumeConfig" + ], "properties": { - "disabled": { - "description": "disabled indicates that authorization should be disabled. By default it will use delegated authorization.", + "allowDisabledDocker": { + "description": "AllowDisabledDocker if true, the Kubelet will ignore errors from Docker. This means that a node can start on a machine that doesn't have docker started.", + "type": "boolean", + "default": false + }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "authConfig": { + "description": "AuthConfig holds authn/authz configuration options", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.NodeAuthConfig" + }, + "dnsBindAddress": { + "description": "DNSBindAddress is the ip:port to serve DNS on. If this is not set, the DNS server will not be started. Because most DNS resolvers will only listen on port 53, if you select an alternative port you will need a DNS proxy like dnsmasq to answer queries for containers. A common configuration is dnsmasq configured on a node IP listening on 53 and delegating queries for dnsDomain to this process, while sending other queries to the host environments nameservers.", + "type": "string", + "default": "" + }, + "dnsDomain": { + "description": "DNSDomain holds the domain suffix that will be used for the DNS search path inside each container. Defaults to 'cluster.local'.", + "type": "string", + "default": "" + }, + "dnsIP": { + "description": "DNSIP is the IP address that pods will use to access cluster DNS. Defaults to the service IP of the Kubernetes master. This IP must be listening on port 53 for compatibility with libc resolvers (which cannot be configured to resolve names from any other port). When running more complex local DNS configurations, this is often set to the local address of a DNS proxy like dnsmasq, which then will consult either the local DNS (see dnsBindAddress) or the master DNS.", + "type": "string", + "default": "" + }, + "dnsNameservers": { + "description": "DNSNameservers is a list of ip:port values of recursive nameservers to forward queries to when running a local DNS server if dnsBindAddress is set. If this value is empty, the DNS server will default to the nameservers listed in /etc/resolv.conf. If you have configured dnsmasq or another DNS proxy on the system, this value should be set to the upstream nameservers dnsmasq resolves with.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "dnsRecursiveResolvConf": { + "description": "DNSRecursiveResolvConf is a path to a resolv.conf file that contains settings for an upstream server. Only the nameservers and port fields are used. The file must exist and parse correctly. It adds extra nameservers to DNSNameservers if set.", + "type": "string", + "default": "" + }, + "dockerConfig": { + "description": "DockerConfig holds Docker related configuration options.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.DockerConfig" + }, + "enableUnidling": { + "description": "EnableUnidling controls whether or not the hybrid unidling proxy will be set up", "type": "boolean" + }, + "imageConfig": { + "description": "ImageConfig holds options that describe how to build image names for system components", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ImageConfig" + }, + "iptablesSyncPeriod": { + "description": "IPTablesSyncPeriod is how often iptable rules are refreshed", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "kubeletArguments": { + "description": "KubeletArguments are key value pairs that will be passed directly to the Kubelet that match the Kubelet's command line arguments. These are not migrated or validated, so if you use them they may become invalid. These values override other settings in NodeConfig which may cause invalid configurations.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "masterClientConnectionOverrides": { + "description": "MasterClientConnectionOverrides provides overrides to the client connection used to connect to the master.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.ClientConnectionOverrides" + }, + "masterKubeConfig": { + "description": "MasterKubeConfig is a filename for the .kubeconfig file that describes how to connect this node to the master", + "type": "string", + "default": "" + }, + "networkConfig": { + "description": "NetworkConfig provides network options for the node", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.NodeNetworkConfig" + }, + "networkPluginName": { + "description": "Deprecated and maintained for backward compatibility, use NetworkConfig.NetworkPluginName instead", + "type": "string" + }, + "nodeIP": { + "description": "Node may have multiple IPs, specify the IP to use for pod traffic routing If not specified, network parse/lookup on the nodeName is performed and the first non-loopback address is used", + "type": "string", + "default": "" + }, + "nodeName": { + "description": "NodeName is the value used to identify this particular node in the cluster. If possible, this should be your fully qualified hostname. If you're describing a set of static nodes to the master, this value must match one of the values in the list", + "type": "string", + "default": "" + }, + "podManifestConfig": { + "description": "PodManifestConfig holds the configuration for enabling the Kubelet to create pods based from a manifest file(s) placed locally on the node", + "$ref": "#/definitions/io.openshift.config.legacy.v1.PodManifestConfig" + }, + "proxyArguments": { + "description": "ProxyArguments are key value pairs that will be passed directly to the Proxy that match the Proxy's command line arguments. These are not migrated or validated, so if you use them they may become invalid. These values override other settings in NodeConfig which may cause invalid configurations.", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "servingInfo": { + "description": "ServingInfo describes how to start serving", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.ServingInfo" + }, + "volumeConfig": { + "description": "VolumeConfig contains options for configuring volumes on the node.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.NodeVolumeConfig" + }, + "volumeDirectory": { + "description": "VolumeDirectory is the directory that volumes will be stored under", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "DelegatedAuthorization", + "Kind": "NodeConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.DeprecatedWebhookTokenAuthenticator": { - "description": "deprecatedWebhookTokenAuthenticator holds the necessary configuration options for a remote token authenticator. It's the same as WebhookTokenAuthenticator but it's missing the 'required' validation on KubeConfig field.", + "io.openshift.config.legacy.v1.NodeNetworkConfig": { + "description": "NodeNetworkConfig provides network options for the node", "type": "object", "required": [ - "kubeConfig" + "networkPluginName", + "mtu" ], "properties": { - "kubeConfig": { - "description": "kubeConfig contains kube config file data which describes how to access the remote webhook service. For further details, see: https://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication The key \"kubeConfig\" is used to locate the data. If the secret or expected key is not found, the webhook is not honored. If the specified kube config data is not valid, the webhook is not honored. The namespace for this secret is determined by the point of use.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "mtu": { + "description": "Maximum transmission unit for the network packets", + "type": "integer", + "format": "int64", + "default": 0 + }, + "networkPluginName": { + "description": "NetworkPluginName is a string specifying the networking plugin", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "DeprecatedWebhookTokenAuthenticator", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.EquinixMetalPlatformSpec": { - "description": "EquinixMetalPlatformSpec holds the desired state of the Equinix Metal infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "EquinixMetalPlatformSpec", + "Kind": "NodeNetworkConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.EquinixMetalPlatformStatus": { - "description": "EquinixMetalPlatformStatus holds the current status of the Equinix Metal infrastructure provider.", + "io.openshift.config.legacy.v1.NodeVolumeConfig": { + "description": "NodeVolumeConfig contains options for configuring volumes on the node.", "type": "object", + "required": [ + "localQuota" + ], "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.", - "type": "string" - }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.", - "type": "string" + "localQuota": { + "description": "LocalQuota contains options for controlling local volume quota on the node.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LocalQuota" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "EquinixMetalPlatformStatus", + "Kind": "NodeVolumeConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.EtcdConnectionInfo": { - "description": "EtcdConnectionInfo holds information necessary for connecting to an etcd server", + "io.openshift.config.legacy.v1.OAuthConfig": { + "description": "OAuthConfig holds the necessary configuration options for OAuth authentication", "type": "object", "required": [ - "ca", - "certFile", - "keyFile" + "masterCA", + "masterURL", + "masterPublicURL", + "assetPublicURL", + "alwaysShowProviderSelection", + "identityProviders", + "grantConfig", + "sessionConfig", + "tokenConfig", + "templates" ], "properties": { - "ca": { - "description": "CA is a file containing trusted roots for the etcd server certificates", + "alwaysShowProviderSelection": { + "description": "AlwaysShowProviderSelection will force the provider selection page to render even when there is only a single provider.", + "type": "boolean", + "default": false + }, + "assetPublicURL": { + "description": "AssetPublicURL is used for building valid client redirect URLs for external access", "type": "string", "default": "" }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "grantConfig": { + "description": "GrantConfig describes how to handle grants", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.GrantConfig" + }, + "identityProviders": { + "description": "IdentityProviders is an ordered list of ways for a user to identify themselves", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.IdentityProvider" + } + }, + "masterCA": { + "description": "MasterCA is the CA for verifying the TLS connection back to the MasterURL.", + "type": "string" + }, + "masterPublicURL": { + "description": "MasterPublicURL is used for building valid client redirect URLs for internal and external access", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "masterURL": { + "description": "MasterURL is used for making server-to-server calls to exchange authorization codes for access tokens", "type": "string", "default": "" }, - "urls": { - "description": "URLs are the URLs for etcd", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "sessionConfig": { + "description": "SessionConfig hold information about configuring sessions.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.SessionConfig" + }, + "templates": { + "description": "Templates allow you to customize pages like the login page.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.OAuthTemplates" + }, + "tokenConfig": { + "description": "TokenConfig contains options for authorization and access tokens", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.TokenConfig" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "EtcdConnectionInfo", + "Kind": "OAuthConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.EtcdStorageConfig": { + "io.openshift.config.legacy.v1.OAuthTemplates": { + "description": "OAuthTemplates allow for customization of pages like the login page", "type": "object", "required": [ - "ca", - "certFile", - "keyFile", - "storagePrefix" + "login", + "providerSelection", + "error" ], "properties": { - "ca": { - "description": "CA is a file containing trusted roots for the etcd server certificates", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "error": { + "description": "Error is a path to a file containing a go template used to render error pages during the authentication or grant flow If unspecified, the default error page is used.", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "login": { + "description": "Login is a path to a file containing a go template used to render the login page. If unspecified, the default login page is used.", "type": "string", "default": "" }, - "storagePrefix": { - "description": "StoragePrefix is the path within etcd that the OpenShift resources will be rooted under. This value, if changed, will mean existing objects in etcd will no longer be located.", + "providerSelection": { + "description": "ProviderSelection is a path to a file containing a go template used to render the provider selection page. If unspecified, the default provider selection page is used.", "type": "string", "default": "" - }, - "urls": { - "description": "URLs are the URLs for etcd", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "EtcdStorageConfig", + "Kind": "OAuthTemplates", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ExternalIPConfig": { - "description": "ExternalIPConfig specifies some IP blocks relevant for the ExternalIP field of a Service resource.", + "io.openshift.config.legacy.v1.OpenIDClaims": { + "description": "OpenIDClaims contains a list of OpenID claims to use when authenticating with an OpenID identity provider", "type": "object", + "required": [ + "id", + "preferredUsername", + "name", + "email" + ], "properties": { - "autoAssignCIDRs": { - "description": "autoAssignCIDRs is a list of CIDRs from which to automatically assign Service.ExternalIP. These are assigned when the service is of type LoadBalancer. In general, this is only useful for bare-metal clusters. In Openshift 3.x, this was misleadingly called \"IngressIPs\". Automatically assigned External IPs are not affected by any ExternalIPPolicy rules. Currently, only one entry may be provided.", + "email": { + "description": "Email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "policy": { - "description": "policy is a set of restrictions applied to the ExternalIP field. If nil or empty, then ExternalIP is not allowed to be set.", - "$ref": "#/definitions/io.openshift.config.v1.ExternalIPPolicy" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ExternalIPConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ExternalIPPolicy": { - "description": "ExternalIPPolicy configures exactly which IPs are allowed for the ExternalIP field in a Service. If the zero struct is supplied, then none are permitted. The policy controller always allows automatically assigned external IPs.", - "type": "object", - "properties": { - "allowedCIDRs": { - "description": "allowedCIDRs is the list of allowed CIDRs.", + "id": { + "description": "ID is the list of claims whose values should be used as the user ID. Required. OpenID standard identity claim is \"sub\"", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "rejectedCIDRs": { - "description": "rejectedCIDRs is the list of disallowed CIDRs. These take precedence over allowedCIDRs.", + "name": { + "description": "Name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } + }, + "preferredUsername": { + "description": "PreferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the id claim", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ExternalIPPolicy", + "Kind": "OpenIDClaims", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ExternalPlatformSpec": { - "description": "ExternalPlatformSpec holds the desired state for the generic External infrastructure provider.", + "io.openshift.config.legacy.v1.OpenIDIdentityProvider": { + "description": "OpenIDIdentityProvider provides identities for users authenticating using OpenID credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "ca", + "clientID", + "clientSecret", + "extraScopes", + "extraAuthorizeParameters", + "urls", + "claims" + ], "properties": { - "platformName": { - "description": "PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "ca": { + "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", "type": "string", - "default": "Unknown" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ExternalPlatformSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ExternalPlatformStatus": { - "description": "ExternalPlatformStatus holds the current status of the generic External infrastructure provider.", - "type": "object", - "properties": { - "cloudControllerManager": { - "description": "cloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI). When omitted, new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.", + "default": "" + }, + "claims": { + "description": "Claims mappings", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.CloudControllerManagerStatus" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ExternalPlatformStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.FeatureGate": { - "description": "Feature holds cluster-wide information about feature gates. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "spec" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "$ref": "#/definitions/io.openshift.config.legacy.v1.OpenIDClaims" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "clientID": { + "description": "ClientID is the oauth client ID", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "clientSecret": { + "description": "ClientSecret is the oauth client secret", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.legacy.v1.StringSource" }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGateSpec" + "extraAuthorizeParameters": { + "description": "ExtraAuthorizeParameters are any custom parameters to add to the authorize request.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "extraScopes": { + "description": "ExtraScopes are any scopes to request in addition to the standard \"openid\" scope.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "urls": { + "description": "URLs to use to authenticate", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGateStatus" + "$ref": "#/definitions/io.openshift.config.legacy.v1.OpenIDURLs" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "FeatureGate", - "Scope": "Clustered" + "Kind": "OpenIDIdentityProvider", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.FeatureGateAttributes": { + "io.openshift.config.legacy.v1.OpenIDURLs": { + "description": "OpenIDURLs are URLs to use when authenticating with an OpenID identity provider", "type": "object", "required": [ - "name" + "authorize", + "token", + "userInfo" ], "properties": { - "name": { - "description": "name is the name of the FeatureGate.", + "authorize": { + "description": "Authorize is the oauth authorization URL", + "type": "string", + "default": "" + }, + "token": { + "description": "Token is the oauth token granting URL", + "type": "string", + "default": "" + }, + "userInfo": { + "description": "UserInfo is the optional userinfo URL. If present, a granted access_token is used to request claims If empty, a granted id_token is parsed for claims", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "FeatureGateAttributes", + "Kind": "OpenIDURLs", "Scope": "Namespaced" } }, - "io.openshift.config.v1.FeatureGateDetails": { + "io.openshift.config.legacy.v1.PodManifestConfig": { + "description": "PodManifestConfig holds the necessary configuration options for using pod manifests", "type": "object", "required": [ - "version" + "path", + "fileCheckIntervalSeconds" ], "properties": { - "disabled": { - "description": "disabled is a list of all feature gates that are disabled in the cluster for the named version.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGateAttributes" - } - }, - "enabled": { - "description": "enabled is a list of all feature gates that are enabled in the cluster for the named version.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGateAttributes" - } + "fileCheckIntervalSeconds": { + "description": "FileCheckIntervalSeconds is the interval in seconds for checking the manifest file(s) for new data The interval needs to be a positive value", + "type": "integer", + "format": "int64", + "default": 0 }, - "version": { - "description": "version matches the version provided by the ClusterVersion and in the ClusterOperator.Status.Versions field.", + "path": { + "description": "Path specifies the path for the pod manifest file or directory If its a directory, its expected to contain on or more manifest files This is used by the Kubelet to create pods on the node", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "FeatureGateDetails", + "Kind": "PodManifestConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.FeatureGateList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.PolicyConfig": { + "description": "holds the necessary configuration options for", "type": "object", "required": [ - "metadata", - "items" + "userAgentMatchingConfig" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGate" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "userAgentMatchingConfig": { + "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.openshift.config.legacy.v1.UserAgentMatchingConfig" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "FeatureGateList", + "Kind": "PolicyConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.FeatureGateSelection": { + "io.openshift.config.legacy.v1.ProjectConfig": { + "description": "holds the necessary configuration options for", "type": "object", + "required": [ + "defaultNodeSelector", + "projectRequestMessage", + "projectRequestTemplate", + "securityAllocator" + ], "properties": { - "customNoUpgrade": { - "description": "customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES. Because of its nature, this setting cannot be validated. If you have any typos or accidentally apply invalid combinations your cluster may fail in an unrecoverable way. featureSet must equal \"CustomNoUpgrade\" must be set to use this field.", - "$ref": "#/definitions/io.openshift.config.v1.CustomFeatureGates" + "defaultNodeSelector": { + "description": "DefaultNodeSelector holds default project node label selector", + "type": "string", + "default": "" }, - "featureSet": { - "description": "featureSet changes the list of features in the cluster. The default is empty. Be very careful adjusting this setting. Turning on or off features may cause irreversible changes in your cluster which cannot be undone.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "FeatureGateSelection", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "featureSet", - "fields-to-discriminateBy": { - "customNoUpgrade": "CustomNoUpgrade" - } - } - ] - }, - "io.openshift.config.v1.FeatureGateSpec": { - "type": "object", - "properties": { - "customNoUpgrade": { - "description": "customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES. Because of its nature, this setting cannot be validated. If you have any typos or accidentally apply invalid combinations your cluster may fail in an unrecoverable way. featureSet must equal \"CustomNoUpgrade\" must be set to use this field.", - "$ref": "#/definitions/io.openshift.config.v1.CustomFeatureGates" + "projectRequestMessage": { + "description": "ProjectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint", + "type": "string", + "default": "" }, - "featureSet": { - "description": "featureSet changes the list of features in the cluster. The default is empty. Be very careful adjusting this setting. Turning on or off features may cause irreversible changes in your cluster which cannot be undone.", - "type": "string" + "projectRequestTemplate": { + "description": "ProjectRequestTemplate is the template to use for creating projects in response to projectrequest. It is in the format namespace/template and it is optional. If it is not specified, a default template is used.", + "type": "string", + "default": "" + }, + "securityAllocator": { + "description": "SecurityAllocator controls the automatic allocation of UIDs and MCS labels to a project. If nil, allocation is disabled.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.SecurityAllocator" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "FeatureGateSpec", + "Kind": "ProjectConfig", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "featureSet", - "fields-to-discriminateBy": { - "customNoUpgrade": "CustomNoUpgrade" - } - } - ] + } }, - "io.openshift.config.v1.FeatureGateStatus": { + "io.openshift.config.legacy.v1.RFC2307Config": { + "description": "RFC2307Config holds the necessary configuration options to define how an LDAP group sync interacts with an LDAP server using the RFC2307 schema", "type": "object", "required": [ - "featureGates" + "groupsQuery", + "groupUIDAttribute", + "groupNameAttributes", + "groupMembershipAttributes", + "usersQuery", + "userUIDAttribute", + "userNameAttributes", + "tolerateMemberNotFoundErrors", + "tolerateMemberOutOfScopeErrors" ], "properties": { - "conditions": { - "description": "conditions represent the observations of the current state. Known .status.conditions.type are: \"DeterminationDegraded\"", + "groupMembershipAttributes": { + "description": "GroupMembershipAttributes defines which attributes on an LDAP group entry will be interpreted as its members. The values contained in those attributes must be queryable by your UserUIDAttribute", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" + "type": "string", + "default": "" + } }, - "featureGates": { - "description": "featureGates contains a list of enabled and disabled featureGates that are keyed by payloadVersion. Operators other than the CVO and cluster-config-operator, must read the .status.featureGates, locate the version they are managing, find the enabled/disabled featuregates and make the operand and operator match. The enabled/disabled values for a particular version may change during the life of the cluster as various .spec.featureSet values are selected. Operators may choose to restart their processes to pick up these changes, but remembering past enable/disable lists is beyond the scope of this API and is the responsibility of individual operators. Only featureGates with .version in the ClusterVersion.status will be present in this list.", + "groupNameAttributes": { + "description": "GroupNameAttributes defines which attributes on an LDAP group entry will be interpreted as its name to use for an OpenShift group", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGateDetails" - }, - "x-kubernetes-list-map-keys": [ - "version" - ], - "x-kubernetes-list-type": "map" + "type": "string", + "default": "" + } + }, + "groupUIDAttribute": { + "description": "GroupUIDAttributes defines which attribute on an LDAP group entry will be interpreted as its unique identifier. (ldapGroupUID)", + "type": "string", + "default": "" + }, + "groupsQuery": { + "description": "AllGroupsQuery holds the template for an LDAP query that returns group entries.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LDAPQuery" + }, + "tolerateMemberNotFoundErrors": { + "description": "TolerateMemberNotFoundErrors determines the behavior of the LDAP sync job when missing user entries are encountered. If 'true', an LDAP query for users that doesn't find any will be tolerated and an only and error will be logged. If 'false', the LDAP sync job will fail if a query for users doesn't find any. The default value is 'false'. Misconfigured LDAP sync jobs with this flag set to 'true' can cause group membership to be removed, so it is recommended to use this flag with caution.", + "type": "boolean", + "default": false + }, + "tolerateMemberOutOfScopeErrors": { + "description": "TolerateMemberOutOfScopeErrors determines the behavior of the LDAP sync job when out-of-scope user entries are encountered. If 'true', an LDAP query for a user that falls outside of the base DN given for the all user query will be tolerated and only an error will be logged. If 'false', the LDAP sync job will fail if a user query would search outside of the base DN specified by the all user query. Misconfigured LDAP sync jobs with this flag set to 'true' can result in groups missing users, so it is recommended to use this flag with caution.", + "type": "boolean", + "default": false + }, + "userNameAttributes": { + "description": "UserNameAttributes defines which attributes on an LDAP user entry will be used, in order, as its OpenShift user name. The first attribute with a non-empty value is used. This should match your PreferredUsername setting for your LDAPPasswordIdentityProvider", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "userUIDAttribute": { + "description": "UserUIDAttribute defines which attribute on an LDAP user entry will be interpreted as its unique identifier. It must correspond to values that will be found from the GroupMembershipAttributes", + "type": "string", + "default": "" + }, + "usersQuery": { + "description": "AllUsersQuery holds the template for an LDAP query that returns user entries.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.LDAPQuery" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "FeatureGateStatus", + "Kind": "RFC2307Config", "Scope": "Namespaced" } }, - "io.openshift.config.v1.FeatureGateTests": { + "io.openshift.config.legacy.v1.RegistryLocation": { + "description": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.", "type": "object", "required": [ - "featureGate", - "tests" + "domainName" ], "properties": { - "featureGate": { - "description": "FeatureGate is the name of the FeatureGate as it appears in The FeatureGate CR instance.", + "domainName": { + "description": "DomainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.", "type": "string", "default": "" }, - "tests": { - "description": "Tests contains an item for every TestName", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TestDetails" - } + "insecure": { + "description": "Insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "FeatureGateTests", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.GCPPlatformSpec": { - "description": "GCPPlatformSpec holds the desired state of the Google Cloud Platform infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GCPPlatformSpec", + "Kind": "RegistryLocation", "Scope": "Namespaced" } }, - "io.openshift.config.v1.GCPPlatformStatus": { - "description": "GCPPlatformStatus holds the current status of the Google Cloud Platform infrastructure provider.", + "io.openshift.config.legacy.v1.RemoteConnectionInfo": { + "description": "RemoteConnectionInfo holds information necessary for establishing a remote connection", "type": "object", "required": [ - "projectID", - "region" + "url", + "ca", + "certFile", + "keyFile" ], "properties": { - "cloudLoadBalancerConfig": { - "description": "cloudLoadBalancerConfig is a union that contains the IP addresses of API, API-Int and Ingress Load Balancers created on the cloud platform. These values would not be populated on on-prem platforms. These Load Balancer IPs are used to configure the in-cluster DNS instances for API, API-Int and Ingress services. `dnsType` is expected to be set to `ClusterHosted` when these Load Balancer IP addresses are populated and used.", - "default": { - "dnsType": "PlatformDefault" - }, - "$ref": "#/definitions/io.openshift.config.v1.CloudLoadBalancerConfig" - }, - "projectID": { - "description": "resourceGroupName is the Project ID for new GCP resources created for the cluster.", + "ca": { + "description": "CA is the CA for verifying TLS connections", "type": "string", "default": "" }, - "region": { - "description": "region holds the region for new GCP resources created for the cluster.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "resourceLabels": { - "description": "resourceLabels is a list of additional labels to apply to GCP resources created for the cluster. See https://cloud.google.com/compute/docs/labeling-resources for information on labeling GCP resources. GCP supports a maximum of 64 labels per resource. OpenShift reserves 32 labels for internal use, allowing 32 labels for user configuration.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.GCPResourceLabel" - }, - "x-kubernetes-list-map-keys": [ - "key" - ], - "x-kubernetes-list-type": "map" + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" }, - "resourceTags": { - "description": "resourceTags is a list of additional tags to apply to GCP resources created for the cluster. See https://cloud.google.com/resource-manager/docs/tags/tags-overview for information on tagging GCP resources. GCP supports a maximum of 50 tags per resource.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.GCPResourceTag" - }, - "x-kubernetes-list-map-keys": [ - "key" - ], - "x-kubernetes-list-type": "map" + "url": { + "description": "URL is the remote URL to connect to", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GCPPlatformStatus", + "Kind": "RemoteConnectionInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.GCPResourceLabel": { - "description": "GCPResourceLabel is a label to apply to GCP resources created for the cluster.", + "io.openshift.config.legacy.v1.RequestHeaderAuthenticationOptions": { + "description": "RequestHeaderAuthenticationOptions provides options for setting up a front proxy against the entire API instead of against the /oauth endpoint.", "type": "object", "required": [ - "key", - "value" + "clientCA", + "clientCommonNames", + "usernameHeaders", + "groupHeaders", + "extraHeaderPrefixes" ], "properties": { - "key": { - "description": "key is the key part of the label. A label key can have a maximum of 63 characters and cannot be empty. Label key must begin with a lowercase letter, and must contain only lowercase letters, numeric characters, and the following special characters `_-`. Label key must not have the reserved prefixes `kubernetes-io` and `openshift-io`.", + "clientCA": { + "description": "ClientCA is a file with the trusted signer certs. It is required.", "type": "string", "default": "" }, - "value": { - "description": "value is the value part of the label. A label value can have a maximum of 63 characters and cannot be empty. Value must contain only lowercase letters, numeric characters, and the following special characters `_-`.", - "type": "string", - "default": "" + "clientCommonNames": { + "description": "ClientCommonNames is a required list of common names to require a match from.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "extraHeaderPrefixes": { + "description": "ExtraHeaderPrefixes is the set of request header prefixes to inspect for user extra. X-Remote-Extra- is suggested.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "groupHeaders": { + "description": "GroupNameHeader is the set of headers to check for group information. All are unioned.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "usernameHeaders": { + "description": "UsernameHeaders is the list of headers to check for user information. First hit wins.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GCPResourceLabel", + "Kind": "RequestHeaderAuthenticationOptions", "Scope": "Namespaced" } }, - "io.openshift.config.v1.GCPResourceTag": { - "description": "GCPResourceTag is a tag to apply to GCP resources created for the cluster.", + "io.openshift.config.legacy.v1.RequestHeaderIdentityProvider": { + "description": "RequestHeaderIdentityProvider provides identities for users authenticating using request header credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "parentID", - "key", - "value" + "loginURL", + "challengeURL", + "clientCA", + "clientCommonNames", + "headers", + "preferredUsernameHeaders", + "nameHeaders", + "emailHeaders" ], "properties": { - "key": { - "description": "key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty. Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `._-`.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "parentID": { - "description": "parentID is the ID of the hierarchical resource where the tags are defined, e.g. at the Organization or the Project level. To find the Organization or Project ID refer to the following pages: https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id, https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects. An OrganizationID must consist of decimal numbers, and cannot have leading zeroes. A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers, and hyphens, and must start with a letter, and cannot end with a hyphen.", + "challengeURL": { + "description": "ChallengeURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect WWW-Authenticate challenges will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", "type": "string", "default": "" }, - "value": { - "description": "value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty. Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `_-.@%=+:,*#\u0026(){}[]` and spaces.", + "clientCA": { + "description": "ClientCA is a file with the trusted signer certs. If empty, no request verification is done, and any direct request to the OAuth server can impersonate any identity from this provider, merely by setting a request header.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "GCPResourceTag", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.GenericAPIServerConfig": { - "description": "GenericAPIServerConfig is an inline-able struct for aggregated apiservers that need to store data in etcd", - "type": "object", - "required": [ - "servingInfo", - "corsAllowedOrigins", - "auditConfig", - "storageConfig", - "admission", - "kubeClientConfig" - ], - "properties": { - "admission": { - "description": "admissionConfig holds information about how to configure admission.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" - }, - "auditConfig": { - "description": "auditConfig describes how to configure audit information", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" }, - "corsAllowedOrigins": { - "description": "corsAllowedOrigins", + "clientCommonNames": { + "description": "ClientCommonNames is an optional list of common names to require a match from. If empty, any client certificate validated against the clientCA bundle is considered authoritative.", "type": "array", "items": { "type": "string", "default": "" } }, - "kubeClientConfig": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" + "emailHeaders": { + "description": "EmailHeaders is the set of headers to check for the email address", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "servingInfo": { - "description": "servingInfo describes how to start serving", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + "headers": { + "description": "Headers is the set of headers to check for identity information", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "storageConfig": { - "description": "storageConfig contains information about how to use", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "GenericAPIServerConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.GenericControllerConfig": { - "description": "GenericControllerConfig provides information to configure a controller", - "type": "object", - "required": [ - "servingInfo", - "leaderElection", - "authentication", - "authorization" - ], - "properties": { - "authentication": { - "description": "authentication allows configuration of authentication for the endpoints", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DelegatedAuthentication" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "authorization": { - "description": "authorization allows configuration of authentication for the endpoints", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DelegatedAuthorization" + "loginURL": { + "description": "LoginURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect interactive logins will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", + "type": "string", + "default": "" }, - "leaderElection": { - "description": "leaderElection provides information to elect a leader. Only override this if you have a specific need", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.LeaderElection" + "nameHeaders": { + "description": "NameHeaders is the set of headers to check for the display name", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "servingInfo": { - "description": "ServingInfo is the HTTP serving information for the controller's endpoints", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + "preferredUsernameHeaders": { + "description": "PreferredUsernameHeaders is the set of headers to check for the preferred username", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GenericControllerConfig", + "Kind": "RequestHeaderIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.GitHubIdentityProvider": { - "description": "GitHubIdentityProvider provides identities for users authenticating using GitHub credentials", + "io.openshift.config.legacy.v1.RoutingConfig": { + "description": "RoutingConfig holds the necessary configuration options for routing to subdomains", "type": "object", "required": [ - "clientID", - "clientSecret" + "subdomain" ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. This can only be configured when hostname is set to a non-empty value. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "clientID": { - "description": "clientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "hostname": { - "description": "hostname is the optional domain (e.g. \"mycompany.com\") for use with a hosted instance of GitHub Enterprise. It must match the GitHub Enterprise settings value configured at /setup/settings#hostname.", + "subdomain": { + "description": "Subdomain is the suffix appended to $service.$namespace. to form the default route hostname DEPRECATED: This field is being replaced by routers setting their own defaults. This is the \"default\" route.", "type": "string", "default": "" - }, - "organizations": { - "description": "organizations optionally restricts which organizations are allowed to log in", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "teams": { - "description": "teams optionally restricts which teams are allowed to log in. Format is \u003corg\u003e/\u003cteam\u003e.", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GitHubIdentityProvider", + "Kind": "RoutingConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.GitLabIdentityProvider": { - "description": "GitLabIdentityProvider provides identities for users authenticating using GitLab credentials", + "io.openshift.config.legacy.v1.SecurityAllocator": { + "description": "SecurityAllocator controls the automatic allocation of UIDs and MCS labels to a project. If nil, allocation is disabled.", "type": "object", "required": [ - "clientID", - "clientSecret", - "url" + "uidAllocatorRange", + "mcsAllocatorRange", + "mcsLabelsPerProject" ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "clientID": { - "description": "clientID is the oauth client ID", + "mcsAllocatorRange": { + "description": "MCSAllocatorRange defines the range of MCS categories that will be assigned to namespaces. The format is \"\u003cprefix\u003e/\u003cnumberOfLabels\u003e[,\u003cmaxCategory\u003e]\". The default is \"s0/2\" and will allocate from c0 -\u003e c1023, which means a total of 535k labels are available (1024 choose 2 ~ 535k). If this value is changed after startup, new projects may receive labels that are already allocated to other projects. Prefix may be any valid SELinux set of terms (including user, role, and type), although leaving them as the default will allow the server to set them automatically.\n\nExamples: * s0:/2 - Allocate labels from s0:c0,c0 to s0:c511,c511 * s0:/2,512 - Allocate labels from s0:c0,c0,c0 to s0:c511,c511,511", "type": "string", "default": "" }, - "clientSecret": { - "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "mcsLabelsPerProject": { + "description": "MCSLabelsPerProject defines the number of labels that should be reserved per project. The default is 5 to match the default UID and MCS ranges (100k namespaces, 535k/5 labels).", + "type": "integer", + "format": "int32", + "default": 0 }, - "url": { - "description": "url is the oauth server base URL", + "uidAllocatorRange": { + "description": "UIDAllocatorRange defines the total set of Unix user IDs (UIDs) that will be allocated to projects automatically, and the size of the block each namespace gets. For example, 1000-1999/10 will allocate ten UIDs per namespace, and will be able to allocate up to 100 blocks before running out of space. The default is to allocate from 1 billion to 2 billion in 10k blocks (which is the expected size of the ranges container images will use once user namespaces are started).", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GitLabIdentityProvider", + "Kind": "SecurityAllocator", "Scope": "Namespaced" } }, - "io.openshift.config.v1.GoogleIdentityProvider": { - "description": "GoogleIdentityProvider provides identities for users authenticating using Google credentials", + "io.openshift.config.legacy.v1.ServiceAccountConfig": { + "description": "ServiceAccountConfig holds the necessary configuration options for a service account", "type": "object", "required": [ - "clientID", - "clientSecret" + "managedNames", + "limitSecretReferences", + "privateKeyFile", + "publicKeyFiles", + "masterCA" ], "properties": { - "clientID": { - "description": "clientID is the oauth client ID", + "limitSecretReferences": { + "description": "LimitSecretReferences controls whether or not to allow a service account to reference any secret in a namespace without explicitly referencing them", + "type": "boolean", + "default": false + }, + "managedNames": { + "description": "ManagedNames is a list of service account names that will be auto-created in every namespace. If no names are specified, the ServiceAccountsController will not be started.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "masterCA": { + "description": "MasterCA is the CA for verifying the TLS connection back to the master. The service account controller will automatically inject the contents of this file into pods so they can verify connections to the master.", "type": "string", "default": "" }, - "clientSecret": { - "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "hostedDomain": { - "description": "hostedDomain is the optional Google App domain (e.g. \"mycompany.com\") to restrict logins to", + "privateKeyFile": { + "description": "PrivateKeyFile is a file containing a PEM-encoded private RSA key, used to sign service account tokens. If no private key is specified, the service account TokensController will not be started.", "type": "string", "default": "" + }, + "publicKeyFiles": { + "description": "PublicKeyFiles is a list of files, each containing a PEM-encoded public RSA key. (If any file contains a private key, the public portion of the key is used) The list of public keys is used to verify presented service account tokens. Each key is tried in order until the list is exhausted or verification succeeds. If no keys are specified, no service account authentication will be available.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "GoogleIdentityProvider", + "Kind": "ServiceAccountConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.HTPasswdIdentityProvider": { - "description": "HTPasswdPasswordIdentityProvider provides identities for users authenticating using htpasswd credentials", + "io.openshift.config.legacy.v1.ServiceServingCert": { + "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", "type": "object", "required": [ - "fileData" + "signer" ], "properties": { - "fileData": { - "description": "fileData is a required reference to a secret by name containing the data to use as the htpasswd file. The key \"htpasswd\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. If the specified htpasswd data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "signer": { + "description": "Signer holds the signing information used to automatically sign serving certificates. If this value is nil, then certs are not signed automatically.", + "$ref": "#/definitions/io.openshift.config.legacy.v1.CertInfo" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "HTPasswdIdentityProvider", + "Kind": "ServiceServingCert", "Scope": "Namespaced" } }, - "io.openshift.config.v1.HTTPServingInfo": { - "description": "HTTPServingInfo holds configuration for serving HTTP", + "io.openshift.config.legacy.v1.ServingInfo": { + "description": "ServingInfo holds information about serving web pages", "type": "object", "required": [ "bindAddress", "bindNetwork", "certFile", "keyFile", - "maxRequestsInFlight", - "requestTimeoutSeconds" + "clientCA", + "namedCertificates" ], "properties": { "bindAddress": { @@ -20288,19 +20614,14 @@ }, "clientCA": { "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", - "type": "string" + "type": "string", + "default": "" }, "keyFile": { "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" }, - "maxRequestsInFlight": { - "description": "MaxRequestsInFlight is the number of concurrent requests allowed to the server. If zero, no limit.", - "type": "integer", - "format": "int64", - "default": 0 - }, "minTLSVersion": { "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", "type": "string" @@ -20310,1317 +20631,1525 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NamedCertificate" + "$ref": "#/definitions/io.openshift.config.legacy.v1.NamedCertificate" } - }, - "requestTimeoutSeconds": { - "description": "RequestTimeoutSeconds is the number of seconds before requests are timed out. The default is 60 minutes, if -1 there is no limit on requests.", - "type": "integer", - "format": "int64", - "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "HTTPServingInfo", + "Kind": "ServingInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.HubSource": { - "description": "HubSource is used to specify the hub source and its configuration", + "io.openshift.config.legacy.v1.SessionConfig": { + "description": "SessionConfig specifies options for cookie-based sessions. Used by AuthRequestHandlerSession", "type": "object", "required": [ - "name", - "disabled" + "sessionSecretsFile", + "sessionMaxAgeSeconds", + "sessionName" ], "properties": { - "disabled": { - "description": "disabled is used to disable a default hub source on cluster", - "type": "boolean", - "default": false + "sessionMaxAgeSeconds": { + "description": "SessionMaxAgeSeconds specifies how long created sessions last. Used by AuthRequestHandlerSession", + "type": "integer", + "format": "int32", + "default": 0 }, - "name": { - "description": "name is the name of one of the default hub sources", + "sessionName": { + "description": "SessionName is the cookie name used to store the session", + "type": "string", + "default": "" + }, + "sessionSecretsFile": { + "description": "SessionSecretsFile is a reference to a file containing a serialized SessionSecrets object If no file is specified, a random signing and encryption key are generated at each server start", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "HubSource", + "Kind": "SessionConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.HubSourceStatus": { - "description": "HubSourceStatus is used to reflect the current state of applying the configuration to a default source", + "io.openshift.config.legacy.v1.SessionSecret": { + "description": "SessionSecret is a secret used to authenticate/decrypt cookie-based sessions", "type": "object", + "required": [ + "authentication", + "encryption" + ], "properties": { - "message": { - "description": "message provides more information regarding failures", - "type": "string" + "authentication": { + "description": "Authentication is used to authenticate sessions using HMAC. Recommended to use a secret with 32 or 64 bytes.", + "type": "string", + "default": "" }, - "status": { - "description": "status indicates success or failure in applying the configuration", - "type": "string" + "encryption": { + "description": "Encryption is used to encrypt sessions. Must be 16, 24, or 32 characters long, to select AES-128, AES-", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "HubSourceStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.IBMCloudPlatformSpec": { - "description": "IBMCloudPlatformSpec holds the desired state of the IBMCloud infrastructure provider. This only includes fields that can be modified in the cluster.", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "IBMCloudPlatformSpec", + "Kind": "SessionSecret", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IBMCloudPlatformStatus": { - "description": "IBMCloudPlatformStatus holds the current status of the IBMCloud infrastructure provider.", + "io.openshift.config.legacy.v1.SessionSecrets": { + "description": "SessionSecrets list the secrets to use to sign/encrypt and authenticate/decrypt created sessions.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "secrets" + ], "properties": { - "cisInstanceCRN": { - "description": "CISInstanceCRN is the CRN of the Cloud Internet Services instance managing the DNS zone for the cluster's base domain", - "type": "string" - }, - "dnsInstanceCRN": { - "description": "DNSInstanceCRN is the CRN of the DNS Services instance managing the DNS zone for the cluster's base domain", - "type": "string" - }, - "location": { - "description": "Location is where the cluster has been deployed", - "type": "string" - }, - "providerType": { - "description": "ProviderType indicates the type of cluster that was created", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "resourceGroupName": { - "description": "ResourceGroupName is the Resource Group for new IBMCloud resources created for the cluster.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "serviceEndpoints": { - "description": "serviceEndpoints is a list of custom endpoints which will override the default service endpoints of an IBM Cloud service. These endpoints are consumed by components within the cluster to reach the respective IBM Cloud Services.", + "secrets": { + "description": "Secrets is a list of secrets New sessions are signed and encrypted using the first secret. Existing sessions are decrypted/authenticated by each secret until one succeeds. This allows rotating secrets.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.IBMCloudServiceEndpoint" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "$ref": "#/definitions/io.openshift.config.legacy.v1.SessionSecret" + } + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "legacy.config.openshift.io", + "Version": "v1", + "Kind": "SessionSecrets", + "Scope": "Namespaced" + } + }, + "io.openshift.config.legacy.v1.SourceStrategyDefaultsConfig": { + "description": "SourceStrategyDefaultsConfig contains values that apply to builds using the source strategy.", + "type": "object", + "properties": { + "incremental": { + "description": "incremental indicates if s2i build strategies should perform an incremental build or not", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "IBMCloudPlatformStatus", + "Kind": "SourceStrategyDefaultsConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IBMCloudServiceEndpoint": { - "description": "IBMCloudServiceEndpoint stores the configuration of a custom url to override existing defaults of IBM Cloud Services.", + "io.openshift.config.legacy.v1.StringSource": { + "description": "StringSource allows specifying a string inline, or externally via env var or file. When it contains only a string value, it marshals to a simple JSON string.", "type": "object", "required": [ - "name", - "url" + "value", + "env", + "file", + "keyFile" ], "properties": { - "name": { - "description": "name is the name of the IBM Cloud service. Possible values are: CIS, COS, COSConfig, DNSServices, GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC. For example, the IBM Cloud Private IAM service could be configured with the service `name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com` Whereas the IBM Cloud Private VPC service for US South (Dallas) could be configured with the service `name` of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`", + "env": { + "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", "type": "string", "default": "" }, - "url": { - "description": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", + "file": { + "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile references a file containing the key to use to decrypt the value.", + "type": "string", + "default": "" + }, + "value": { + "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "IBMCloudServiceEndpoint", + "Kind": "StringSource", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IdentityProvider": { - "description": "IdentityProvider provides identities for users authenticating using credentials", + "io.openshift.config.legacy.v1.StringSourceSpec": { + "description": "StringSourceSpec specifies a string value, or external location", "type": "object", "required": [ - "name", - "type" + "value", + "env", + "file", + "keyFile" ], "properties": { - "basicAuth": { - "description": "basicAuth contains configuration options for the BasicAuth IdP", - "$ref": "#/definitions/io.openshift.config.v1.BasicAuthIdentityProvider" - }, - "github": { - "description": "github enables user authentication using GitHub credentials", - "$ref": "#/definitions/io.openshift.config.v1.GitHubIdentityProvider" - }, - "gitlab": { - "description": "gitlab enables user authentication using GitLab credentials", - "$ref": "#/definitions/io.openshift.config.v1.GitLabIdentityProvider" - }, - "google": { - "description": "google enables user authentication using Google credentials", - "$ref": "#/definitions/io.openshift.config.v1.GoogleIdentityProvider" - }, - "htpasswd": { - "description": "htpasswd enables user authentication using an HTPasswd file to validate credentials", - "$ref": "#/definitions/io.openshift.config.v1.HTPasswdIdentityProvider" - }, - "keystone": { - "description": "keystone enables user authentication using keystone password credentials", - "$ref": "#/definitions/io.openshift.config.v1.KeystoneIdentityProvider" - }, - "ldap": { - "description": "ldap enables user authentication using LDAP credentials", - "$ref": "#/definitions/io.openshift.config.v1.LDAPIdentityProvider" - }, - "mappingMethod": { - "description": "mappingMethod determines how identities from this provider are mapped to users Defaults to \"claim\"", - "type": "string" - }, - "name": { - "description": "name is used to qualify the identities returned by this provider. - It MUST be unique and not shared by any other identity provider used - It MUST be a valid path segment: name cannot equal \".\" or \"..\" or contain \"/\" or \"%\" or \":\"\n Ref: https://godoc.org/github.com/openshift/origin/pkg/user/apis/user/validation#ValidateIdentityProviderName", + "env": { + "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", "type": "string", "default": "" }, - "openID": { - "description": "openID enables user authentication using OpenID credentials", - "$ref": "#/definitions/io.openshift.config.v1.OpenIDIdentityProvider" + "file": { + "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", + "type": "string", + "default": "" }, - "requestHeader": { - "description": "requestHeader enables user authentication using request header credentials", - "$ref": "#/definitions/io.openshift.config.v1.RequestHeaderIdentityProvider" + "keyFile": { + "description": "KeyFile references a file containing the key to use to decrypt the value.", + "type": "string", + "default": "" }, - "type": { - "description": "type identifies the identity provider type for this entry.", + "value": { + "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "IdentityProvider", + "Kind": "StringSourceSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IdentityProviderConfig": { - "description": "IdentityProviderConfig contains configuration for using a specific identity provider", + "io.openshift.config.legacy.v1.TokenConfig": { + "description": "TokenConfig holds the necessary configuration options for authorization and access tokens", "type": "object", "required": [ - "type" + "authorizeTokenMaxAgeSeconds", + "accessTokenMaxAgeSeconds" ], "properties": { - "basicAuth": { - "description": "basicAuth contains configuration options for the BasicAuth IdP", - "$ref": "#/definitions/io.openshift.config.v1.BasicAuthIdentityProvider" - }, - "github": { - "description": "github enables user authentication using GitHub credentials", - "$ref": "#/definitions/io.openshift.config.v1.GitHubIdentityProvider" - }, - "gitlab": { - "description": "gitlab enables user authentication using GitLab credentials", - "$ref": "#/definitions/io.openshift.config.v1.GitLabIdentityProvider" - }, - "google": { - "description": "google enables user authentication using Google credentials", - "$ref": "#/definitions/io.openshift.config.v1.GoogleIdentityProvider" - }, - "htpasswd": { - "description": "htpasswd enables user authentication using an HTPasswd file to validate credentials", - "$ref": "#/definitions/io.openshift.config.v1.HTPasswdIdentityProvider" - }, - "keystone": { - "description": "keystone enables user authentication using keystone password credentials", - "$ref": "#/definitions/io.openshift.config.v1.KeystoneIdentityProvider" - }, - "ldap": { - "description": "ldap enables user authentication using LDAP credentials", - "$ref": "#/definitions/io.openshift.config.v1.LDAPIdentityProvider" - }, - "openID": { - "description": "openID enables user authentication using OpenID credentials", - "$ref": "#/definitions/io.openshift.config.v1.OpenIDIdentityProvider" + "accessTokenInactivityTimeoutSeconds": { + "description": "AccessTokenInactivityTimeoutSeconds defined the default token inactivity timeout for tokens granted by any client. Setting it to nil means the feature is completely disabled (default) The default setting can be overriden on OAuthClient basis. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. Valid values are: - 0: Tokens never time out - X: Tokens time out if there is no activity for X seconds The current minimum allowed value for X is 300 (5 minutes)", + "type": "integer", + "format": "int32" }, - "requestHeader": { - "description": "requestHeader enables user authentication using request header credentials", - "$ref": "#/definitions/io.openshift.config.v1.RequestHeaderIdentityProvider" + "accessTokenMaxAgeSeconds": { + "description": "AccessTokenMaxAgeSeconds defines the maximum age of access tokens", + "type": "integer", + "format": "int32", + "default": 0 }, - "type": { - "description": "type identifies the identity provider type for this entry.", - "type": "string", - "default": "" + "authorizeTokenMaxAgeSeconds": { + "description": "AuthorizeTokenMaxAgeSeconds defines the maximum age of authorize tokens", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "IdentityProviderConfig", + "Kind": "TokenConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Image": { - "description": "Image governs policies related to imagestream imports and runtime configuration for external registries. It allows cluster admins to configure which registries OpenShift is allowed to import images from, extra CA trust bundles for external registries, and policies to block or allow registry hostnames. When exposing OpenShift's image registry to the public, this also lets cluster admins specify the external hostname.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.UserAgentDenyRule": { + "description": "UserAgentDenyRule adds a rejection message that can be used to help a user figure out how to get an approved client", "type": "object", "required": [ - "spec" + "regex", + "httpVerbs", + "rejectionMessage" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "httpVerbs": { + "description": "HTTPVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageSpec" + "regex": { + "description": "UserAgentRegex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", + "type": "string", + "default": "" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageStatus" + "rejectionMessage": { + "description": "RejectionMessage is the message shown when rejecting a client. If it is not a set, the default message is used.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "Image", - "Scope": "Clustered" + "Kind": "UserAgentDenyRule", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageContentPolicy": { - "description": "ImageContentPolicy holds cluster-wide information about how to handle registry mirror rules. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.UserAgentMatchRule": { + "description": "UserAgentMatchRule describes how to match a given request based on User-Agent and HTTPVerb", "type": "object", "required": [ - "spec" + "regex", + "httpVerbs" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "httpVerbs": { + "description": "HTTPVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageContentPolicySpec" + "regex": { + "description": "UserAgentRegex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ImageContentPolicy", - "Scope": "Clustered" + "Kind": "UserAgentMatchRule", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageContentPolicyList": { - "description": "ImageContentPolicyList lists the items in the ImageContentPolicy CRD.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.legacy.v1.UserAgentMatchingConfig": { + "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", "type": "object", "required": [ - "metadata", - "items" + "requiredClients", + "deniedClients", + "defaultRejectionMessage" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "defaultRejectionMessage": { + "description": "DefaultRejectionMessage is the message shown when rejecting a client. If it is not a set, a generic message is given.", + "type": "string", + "default": "" }, - "items": { + "deniedClients": { + "description": "If this list is non-empty, then a User-Agent must not match any of the UserAgentRegexes", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageContentPolicy" + "$ref": "#/definitions/io.openshift.config.legacy.v1.UserAgentDenyRule" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "requiredClients": { + "description": "If this list is non-empty, then a User-Agent must match one of the UserAgentRegexes to be allowed", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.legacy.v1.UserAgentMatchRule" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "legacy.config.openshift.io", + "Version": "v1", + "Kind": "UserAgentMatchingConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.legacy.v1.WebhookTokenAuthenticator": { + "description": "WebhookTokenAuthenticators holds the necessary configuation options for external token authenticators", + "type": "object", + "required": [ + "configFile", + "cacheTTL" + ], + "properties": { + "cacheTTL": { + "description": "CacheTTL indicates how long an authentication result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get a default timeout of 2 minutes. If zero (e.g. \"0m\"), caching is disabled", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "configFile": { + "description": "ConfigFile is a path to a Kubeconfig file with the webhook configuration", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "legacy.config.openshift.io", "Version": "v1", - "Kind": "ImageContentPolicyList", + "Kind": "WebhookTokenAuthenticator", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageContentPolicySpec": { - "description": "ImageContentPolicySpec is the specification of the ImageContentPolicy CRD.", + "io.openshift.config.openshiftcontrolplane.v1.APIServers": { "type": "object", + "required": [ + "perGroupOptions" + ], "properties": { - "repositoryDigestMirrors": { - "description": "repositoryDigestMirrors allows images referenced by image digests in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in RepositoryDigestMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. To pull image from mirrors by tags, should set the \"allowMirrorByTags\".\n\nEach “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nIf the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified.", + "perGroupOptions": { + "description": "perGroupOptions is a list of enabled/disabled API servers in addition to the defaults", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.RepositoryDigestMirrors" - }, - "x-kubernetes-list-map-keys": [ - "source" - ], - "x-kubernetes-list-type": "map" + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.PerGroupOptions" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageContentPolicySpec", + "Kind": "APIServers", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageDigestMirrorSet": { - "description": "ImageDigestMirrorSet holds cluster-wide information about how to handle registry mirror rules on using digest pull specification. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.BuildControllerConfig": { "type": "object", "required": [ - "spec" + "imageTemplateFormat", + "buildDefaults", + "buildOverrides", + "additionalTrustedCA" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "additionalTrustedCA": { + "description": "additionalTrustedCA is a path to a pem bundle file containing additional CAs that should be trusted for image pushes and pulls during builds.", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "buildDefaults": { + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.BuildDefaultsConfig" }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrorSetSpec" + "buildOverrides": { + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.BuildOverridesConfig" }, - "status": { - "description": "status contains the observed state of the resource.", + "imageTemplateFormat": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrorSetStatus" + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ImageConfig" } }, "x-fabric8-info": { - "Type": "object", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageDigestMirrorSet", - "Scope": "Clustered" + "Kind": "BuildControllerConfig", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageDigestMirrorSetList": { - "description": "ImageDigestMirrorSetList lists the items in the ImageDigestMirrorSet CRD.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.BuildDefaultsConfig": { + "description": "BuildDefaultsConfig controls the default information for Builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", - "required": [ - "metadata", - "items" - ], "properties": { + "annotations": { + "description": "annotations are annotations that will be added to the build pod", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "items": { + "env": { + "description": "env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrorSet" + "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar" + } + }, + "gitHTTPProxy": { + "description": "gitHTTPProxy is the location of the HTTPProxy for Git source", + "type": "string" + }, + "gitHTTPSProxy": { + "description": "gitHTTPSProxy is the location of the HTTPSProxy for Git source", + "type": "string" + }, + "gitNoProxy": { + "description": "gitNoProxy is the list of domains for which the proxy should not be used", + "type": "string" + }, + "imageLabels": { + "description": "imageLabels is a list of labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "nodeSelector": { + "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "resources": { + "description": "resources defines resource requirements to execute the build.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" + }, + "sourceStrategyDefaults": { + "description": "sourceStrategyDefaults are default values that apply to builds using the source strategy.", + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.SourceStrategyDefaultsConfig" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "object", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageDigestMirrorSetList", + "Kind": "BuildDefaultsConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageDigestMirrorSetSpec": { - "description": "ImageDigestMirrorSetSpec is the specification of the ImageDigestMirrorSet CRD.", + "io.openshift.config.openshiftcontrolplane.v1.BuildOverridesConfig": { + "description": "BuildOverridesConfig controls override settings for builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "properties": { - "imageDigestMirrors": { - "description": "imageDigestMirrors allows images referenced by image digests in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in imageDigestMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. To use mirrors to pull images using tag specification, users should configure a list of mirrors using \"ImageTagMirrorSet\" CRD.\n\nIf the image pull specification matches the repository of \"source\" in multiple imagedigestmirrorset objects, only the objects which define the most specific namespace match will be used. For example, if there are objects using quay.io/libpod and quay.io/libpod/busybox as the \"source\", only the objects using quay.io/libpod/busybox are going to apply for pull specification quay.io/libpod/busybox. Each “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nIf the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified. Users who want to use a specific order of mirrors, should configure them into one list of mirrors using the expected order.", + "annotations": { + "description": "annotations are annotations that will be added to the build pod", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "forcePull": { + "description": "forcePull overrides, if set, the equivalent value in the builds, i.e. false disables force pull for all builds, true enables force pull for all builds, independently of what each build specifies itself", + "type": "boolean" + }, + "imageLabels": { + "description": "imageLabels is a list of labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrors" - }, - "x-kubernetes-list-type": "atomic" + "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "nodeSelector": { + "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "tolerations": { + "description": "tolerations is a list of Tolerations that will override any existing tolerations set on a build pod.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" + } } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ImageDigestMirrorSetSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ImageDigestMirrorSetStatus": { - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageDigestMirrorSetStatus", + "Kind": "BuildOverridesConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageDigestMirrors": { - "description": "ImageDigestMirrors holds cluster-wide information about how to handle mirrors in the registries config.", + "io.openshift.config.openshiftcontrolplane.v1.ClusterNetworkEntry": { + "description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.", "type": "object", "required": [ - "source" + "cidr", + "hostSubnetLength" ], "properties": { - "mirrorSourcePolicy": { - "description": "mirrorSourcePolicy defines the fallback policy if fails to pull image from the mirrors. If unset, the image will continue to be pulled from the the repository in the pull spec. sourcePolicy is valid configuration only when one or more mirrors are in the mirror list.", - "type": "string" - }, - "mirrors": { - "description": "mirrors is zero or more locations that may also contain the same images. No mirror will be configured if not specified. Images can be pulled from these mirrors only if they are referenced by their digests. The mirrored location is obtained by replacing the part of the input reference that matches source by the mirrors entry, e.g. for registry.redhat.io/product/repo reference, a (source, mirror) pair *.redhat.io, mirror.local/redhat causes a mirror.local/redhat/product/repo repository to be used. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. If no mirror is specified or all image pulls from the mirror list fail, the image will continue to be pulled from the repository in the pull spec unless explicitly prohibited by \"mirrorSourcePolicy\" Other cluster configuration, including (but not limited to) other imageDigestMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering. \"mirrors\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "source": { - "description": "source matches the repository that users refer to, e.g. in image pull specifications. Setting source to a registry hostname e.g. docker.io. quay.io, or registry.redhat.io, will match the image pull specification of corressponding registry. \"source\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo [*.]host for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", + "cidr": { + "description": "CIDR defines the total range of a cluster networks address space.", "type": "string", "default": "" + }, + "hostSubnetLength": { + "description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pod.", + "type": "integer", + "format": "int64", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageDigestMirrors", + "Kind": "ClusterNetworkEntry", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageLabel": { + "io.openshift.config.openshiftcontrolplane.v1.DeployerControllerConfig": { "type": "object", "required": [ - "name" + "imageTemplateFormat" ], "properties": { - "name": { - "description": "Name defines the name of the label. It must have non-zero length.", - "type": "string", - "default": "" - }, - "value": { - "description": "Value defines the literal value of the label.", - "type": "string" + "imageTemplateFormat": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ImageConfig" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageLabel", + "Kind": "DeployerControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.DockerPullSecretControllerConfig": { "type": "object", "required": [ - "metadata", - "items" + "registryURLs", + "internalRegistryHostname" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "internalRegistryHostname": { + "description": "internalRegistryHostname is the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. Docker pull secrets will be generated for this registry.", + "type": "string", + "default": "" }, - "items": { + "registryURLs": { + "description": "registryURLs is a list of urls that the docker pull secrets should be valid for.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Image" + "type": "string", + "default": "" } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageList", + "Kind": "DockerPullSecretControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageSpec": { + "io.openshift.config.openshiftcontrolplane.v1.FrontProxyConfig": { "type": "object", + "required": [ + "clientCA", + "allowedNames", + "usernameHeaders", + "groupHeaders", + "extraHeaderPrefixes" + ], "properties": { - "additionalTrustedCA": { - "description": "additionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted during imagestream import, pod image pull, build image pull, and imageregistry pullthrough. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "allowedRegistriesForImport": { - "description": "allowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.", + "allowedNames": { + "description": "allowedNames is an optional list of common names to require a match from.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.RegistryLocation" + "type": "string", + "default": "" } }, - "externalRegistryHostnames": { - "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "clientCA": { + "description": "clientCA is a path to the CA bundle to use to verify the common name of the front proxy's client cert", + "type": "string", + "default": "" + }, + "extraHeaderPrefixes": { + "description": "extraHeaderPrefixes is the set of header prefixes to check for user extra", "type": "array", "items": { "type": "string", "default": "" } }, - "registrySources": { - "description": "registrySources contains configuration that determines how the container runtime should treat individual registries when accessing images for builds+pods. (e.g. whether or not to allow insecure access). It does not contain configuration for the internal cluster registry.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.RegistrySources" + "groupHeaders": { + "description": "groupHeaders is the set of headers to check for groups", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "usernameHeaders": { + "description": "usernameHeaders is the set of headers to check for the username", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageSpec", + "Kind": "FrontProxyConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageStatus": { + "io.openshift.config.openshiftcontrolplane.v1.ImageConfig": { + "description": "ImageConfig holds the necessary configuration options for building image names for system components", "type": "object", + "required": [ + "format", + "latest" + ], "properties": { - "externalRegistryHostnames": { - "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "format": { + "description": "Format is the format of the name to be built for the system component", + "type": "string", + "default": "" }, - "internalRegistryHostname": { - "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. This value is set by the image registry operator which controls the internal registry hostname.", - "type": "string" + "latest": { + "description": "Latest determines if the latest tag will be pulled from the registry", + "type": "boolean", + "default": false } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageStatus", + "Kind": "ImageConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageTagMirrorSet": { - "description": "ImageTagMirrorSet holds cluster-wide information about how to handle registry mirror rules on using tag pull specification. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.ImageImportControllerConfig": { "type": "object", "required": [ - "spec" + "maxScheduledImageImportsPerMinute", + "disableScheduledImport", + "scheduledImageImportMinimumIntervalSeconds" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "disableScheduledImport": { + "description": "disableScheduledImport allows scheduled background import of images to be disabled.", + "type": "boolean", + "default": false }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrorSetSpec" + "maxScheduledImageImportsPerMinute": { + "description": "maxScheduledImageImportsPerMinute is the maximum number of image streams that will be imported in the background per minute. The default value is 60. Set to -1 for unlimited.", + "type": "integer", + "format": "int32", + "default": 0 }, - "status": { - "description": "status contains the observed state of the resource.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrorSetStatus" + "scheduledImageImportMinimumIntervalSeconds": { + "description": "scheduledImageImportMinimumIntervalSeconds is the minimum number of seconds that can elapse between when image streams scheduled for background import are checked against the upstream repository. The default value is 15 minutes.", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { - "Type": "object", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageTagMirrorSet", - "Scope": "Clustered" + "Kind": "ImageImportControllerConfig", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageTagMirrorSetList": { - "description": "ImageTagMirrorSetList lists the items in the ImageTagMirrorSet CRD.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.ImagePolicyConfig": { "type": "object", "required": [ - "metadata", - "items" + "maxImagesBulkImportedPerRepository", + "allowedRegistriesForImport", + "internalRegistryHostname", + "externalRegistryHostnames", + "additionalTrustedCA" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "additionalTrustedCA": { + "description": "additionalTrustedCA is a path to a pem bundle file containing additional CAs that should be trusted during imagestream import.", + "type": "string", + "default": "" }, - "items": { + "allowedRegistriesForImport": { + "description": "allowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrorSet" + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.RegistryLocation" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "externalRegistryHostnames": { + "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "imageStreamImportMode": { + "description": "imageStreamImportMode provides the import mode value for imagestreams. It can be `Legacy` or `PreserveOriginal`. `Legacy` indicates that the legacy behaviour should be used. For manifest lists, the legacy behaviour will discard the manifest list and import a single sub-manifest. In this case, the platform is chosen in the following order of priority: 1. tag annotations; 2. control plane arch/os; 3. linux/amd64; 4. the first manifest in the list. `PreserveOriginal` indicates that the original manifest will be preserved. For manifest lists, the manifest list and all its sub-manifests will be imported.If this value is specified, this setting is applied to all newly created imagestreams which do not have the value set.\n\nPossible enum values:\n - `\"Legacy\"` indicates that the legacy behaviour should be used. For manifest lists, the legacy behaviour will discard the manifest list and import a single sub-manifest. In this case, the platform is chosen in the following order of priority: 1. tag annotations; 2. control plane arch/os; 3. linux/amd64; 4. the first manifest in the list. This mode is the default.\n - `\"PreserveOriginal\"` indicates that the original manifest will be preserved. For manifest lists, the manifest list and all its sub-manifests will be imported.", + "type": "string", + "default": "", + "enum": [ + "Legacy", + "PreserveOriginal" + ] + }, + "internalRegistryHostname": { + "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.", + "type": "string", + "default": "" + }, + "maxImagesBulkImportedPerRepository": { + "description": "maxImagesBulkImportedPerRepository controls the number of images that are imported when a user does a bulk import of a container repository. This number is set low to prevent users from importing large numbers of images accidentally. Set -1 for no limit.", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageTagMirrorSetList", + "Kind": "ImagePolicyConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageTagMirrorSetSpec": { - "description": "ImageTagMirrorSetSpec is the specification of the ImageTagMirrorSet CRD.", + "io.openshift.config.openshiftcontrolplane.v1.IngressControllerConfig": { "type": "object", + "required": [ + "ingressIPNetworkCIDR" + ], "properties": { - "imageTagMirrors": { - "description": "imageTagMirrors allows images referenced by image tags in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in imageTagMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. To use mirrors to pull images using digest specification only, users should configure a list of mirrors using \"ImageDigestMirrorSet\" CRD.\n\nIf the image pull specification matches the repository of \"source\" in multiple imagetagmirrorset objects, only the objects which define the most specific namespace match will be used. For example, if there are objects using quay.io/libpod and quay.io/libpod/busybox as the \"source\", only the objects using quay.io/libpod/busybox are going to apply for pull specification quay.io/libpod/busybox. Each “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nIf the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified. Users who want to use a deterministic order of mirrors, should configure them into one list of mirrors using the expected order.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrors" - }, - "x-kubernetes-list-type": "atomic" + "ingressIPNetworkCIDR": { + "description": "ingressIPNetworkCIDR controls the range to assign ingress ips from for services of type LoadBalancer on bare metal. If empty, ingress ips will not be assigned. It may contain a single CIDR that will be allocated from. For security reasons, you should ensure that this range does not overlap with the CIDRs reserved for external ips, nodes, pods, or services.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageTagMirrorSetSpec", + "Kind": "IngressControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageTagMirrorSetStatus": { + "io.openshift.config.openshiftcontrolplane.v1.JenkinsPipelineConfig": { + "description": "JenkinsPipelineConfig holds configuration for the Jenkins pipeline strategy", "type": "object", + "required": [ + "autoProvisionEnabled", + "templateNamespace", + "templateName", + "serviceName", + "parameters" + ], + "properties": { + "autoProvisionEnabled": { + "description": "autoProvisionEnabled determines whether a Jenkins server will be spawned from the provided template when the first build config in the project with type JenkinsPipeline is created. When not specified this option defaults to true.", + "type": "boolean" + }, + "parameters": { + "description": "parameters specifies a set of optional parameters to the Jenkins template.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "serviceName": { + "description": "serviceName is the name of the Jenkins service OpenShift uses to detect whether a Jenkins pipeline handler has already been installed in a project. This value *must* match a service name in the provided template.", + "type": "string", + "default": "" + }, + "templateName": { + "description": "templateName is the name of the default Jenkins template", + "type": "string", + "default": "" + }, + "templateNamespace": { + "description": "templateNamespace contains the namespace name where the Jenkins template is stored", + "type": "string", + "default": "" + } + }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageTagMirrorSetStatus", + "Kind": "JenkinsPipelineConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ImageTagMirrors": { - "description": "ImageTagMirrors holds cluster-wide information about how to handle mirrors in the registries config.", + "io.openshift.config.openshiftcontrolplane.v1.NetworkControllerConfig": { + "description": "MasterNetworkConfig to be passed to the compiled in network plugin", "type": "object", "required": [ - "source" + "networkPluginName", + "clusterNetworks", + "serviceNetworkCIDR", + "vxlanPort" ], "properties": { - "mirrorSourcePolicy": { - "description": "mirrorSourcePolicy defines the fallback policy if fails to pull image from the mirrors. If unset, the image will continue to be pulled from the repository in the pull spec. sourcePolicy is valid configuration only when one or more mirrors are in the mirror list.", - "type": "string" - }, - "mirrors": { - "description": "mirrors is zero or more locations that may also contain the same images. No mirror will be configured if not specified. Images can be pulled from these mirrors only if they are referenced by their tags. The mirrored location is obtained by replacing the part of the input reference that matches source by the mirrors entry, e.g. for registry.redhat.io/product/repo reference, a (source, mirror) pair *.redhat.io, mirror.local/redhat causes a mirror.local/redhat/product/repo repository to be used. Pulling images by tag can potentially yield different images, depending on which endpoint we pull from. Configuring a list of mirrors using \"ImageDigestMirrorSet\" CRD and forcing digest-pulls for mirrors avoids that issue. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. If no mirror is specified or all image pulls from the mirror list fail, the image will continue to be pulled from the repository in the pull spec unless explicitly prohibited by \"mirrorSourcePolicy\". Other cluster configuration, including (but not limited to) other imageTagMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering. \"mirrors\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", + "clusterNetworks": { + "description": "clusterNetworks contains a list of cluster networks that defines the global overlay networks L3 space.", "type": "array", "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ClusterNetworkEntry" + } }, - "source": { - "description": "source matches the repository that users refer to, e.g. in image pull specifications. Setting source to a registry hostname e.g. docker.io. quay.io, or registry.redhat.io, will match the image pull specification of corressponding registry. \"source\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo [*.]host for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", + "networkPluginName": { + "type": "string", + "default": "" + }, + "serviceNetworkCIDR": { "type": "string", "default": "" + }, + "vxlanPort": { + "type": "integer", + "format": "int64", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "ImageTagMirrors", + "Kind": "NetworkControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Infrastructure": { - "description": "Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.OpenShiftAPIServerConfig": { + "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "servingInfo", + "corsAllowedOrigins", + "auditConfig", + "storageConfig", + "admission", + "kubeClientConfig", + "aggregatorConfig", + "imagePolicyConfig", + "projectConfig", + "routingConfig", + "serviceAccountOAuthGrantMethod", + "jenkinsPipelineConfig", + "cloudProviderFile", + "apiServerArguments", + "apiServers" ], "properties": { + "admission": { + "description": "admissionConfig holds information about how to configure admission.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" + }, + "aggregatorConfig": { + "description": "aggregatorConfig contains information about how to verify the aggregator front proxy", + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.FrontProxyConfig" + }, + "apiServerArguments": { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "apiServers": { + "description": "apiServers holds information about enabled/disabled API servers", + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.APIServers" + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "auditConfig": { + "description": "auditConfig describes how to configure audit information", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" + }, + "cloudProviderFile": { + "description": "cloudProviderFile points to the cloud config file", + "type": "string", + "default": "" + }, + "corsAllowedOrigins": { + "description": "corsAllowedOrigins", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "imagePolicyConfig": { + "description": "imagePolicyConfig feeds the image policy admission plugin", + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ImagePolicyConfig" + }, + "jenkinsPipelineConfig": { + "description": "jenkinsPipelineConfig holds information about the default Jenkins template used for JenkinsPipeline build strategy.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.JenkinsPipelineConfig" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "kubeClientConfig": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" }, - "spec": { - "description": "spec holds user settable values for configuration", + "projectConfig": { + "description": "projectConfig feeds an admission plugin", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.InfrastructureSpec" + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ProjectConfig" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "routingConfig": { + "description": "routingConfig holds information about routing and route generation", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.InfrastructureStatus" + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.RoutingConfig" + }, + "serviceAccountOAuthGrantMethod": { + "description": "serviceAccountOAuthGrantMethod is used for determining client authorization for service account oauth client. It must be either: deny, prompt, or \"\"", + "type": "string", + "default": "" + }, + "servingInfo": { + "description": "servingInfo describes how to start serving", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + }, + "storageConfig": { + "description": "storageConfig contains information about how to use", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "Infrastructure", - "Scope": "Clustered" + "Kind": "OpenShiftAPIServerConfig", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.InfrastructureList": { - "description": "InfrastructureList is\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.OpenShiftControllerManagerConfig": { + "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "metadata", - "items" + "kubeClientConfig", + "servingInfo", + "leaderElection", + "controllers", + "resourceQuota", + "serviceServingCert", + "deployer", + "build", + "serviceAccount", + "dockerPullSecret", + "network", + "ingress", + "imageImport", + "securityAllocator", + "featureGates" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "items": { + "build": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.BuildControllerConfig" + }, + "controllers": { + "description": "controllers is a list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller \"+ named 'foo', '-foo' disables the controller named 'foo'. Defaults to \"*\".", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Infrastructure" + "type": "string", + "default": "" + } + }, + "deployer": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.DeployerControllerConfig" + }, + "dockerPullSecret": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.DockerPullSecretControllerConfig" + }, + "featureGates": { + "description": "featureGates are the set of extra OpenShift feature gates for openshift-controller-manager. These feature gates can be used to enable features that are tech preview or otherwise not available on OpenShift by default.", + "type": "array", + "items": { + "type": "string", + "default": "" } }, + "imageImport": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ImageImportControllerConfig" + }, + "ingress": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.IngressControllerConfig" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "kubeClientConfig": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" + }, + "leaderElection": { + "description": "leaderElection defines the configuration for electing a controller instance to make changes to the cluster. If unspecified, the ControllerTTL value is checked to determine whether the legacy direct etcd election code will be used.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.LeaderElection" + }, + "network": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.NetworkControllerConfig" + }, + "resourceQuota": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ResourceQuotaControllerConfig" + }, + "securityAllocator": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.SecurityAllocator" + }, + "serviceAccount": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ServiceAccountControllerConfig" + }, + "serviceServingCert": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.openshiftcontrolplane.v1.ServiceServingCert" + }, + "servingInfo": { + "description": "servingInfo describes how to start serving", + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "object", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "InfrastructureList", + "Kind": "OpenShiftControllerManagerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.InfrastructureSpec": { - "description": "InfrastructureSpec contains settings that apply to the cluster infrastructure.", + "io.openshift.config.openshiftcontrolplane.v1.PerGroupOptions": { "type": "object", + "required": [ + "name", + "enabledVersions", + "disabledVersions" + ], "properties": { - "cloudConfig": { - "description": "cloudConfig is a reference to a ConfigMap containing the cloud provider configuration file. This configuration file is used to configure the Kubernetes cloud provider integration when using the built-in cloud provider integration or the external cloud controller manager. The namespace for this config map is openshift-config.\n\ncloudConfig should only be consumed by the kube_cloud_config controller. The controller is responsible for using the user configuration in the spec for various platforms and combining that with the user provided ConfigMap in this field to create a stitched kube cloud config. The controller generates a ConfigMap `kube-cloud-config` in `openshift-config-managed` namespace with the kube cloud config is stored in `cloud.conf` key. All the clients are expected to use the generated ConfigMap only.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapFileReference" + "disabledVersions": { + "description": "disabledVersions is a list of versions that must be disabled in addition to the defaults. Must not collide with the list of enabled versions", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "platformSpec": { - "description": "platformSpec holds desired information specific to the underlying infrastructure provider.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.PlatformSpec" + "enabledVersions": { + "description": "enabledVersions is a list of versions that must be enabled in addition to the defaults. Must not collide with the list of disabled versions", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "name": { + "description": "name is an API server name (see OpenShiftAPIserverName typed constants for a complete list of available API servers).", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "InfrastructureSpec", + "Kind": "PerGroupOptions", "Scope": "Namespaced" } }, - "io.openshift.config.v1.InfrastructureStatus": { - "description": "InfrastructureStatus describes the infrastructure the cluster is leveraging.", + "io.openshift.config.openshiftcontrolplane.v1.ProjectConfig": { "type": "object", "required": [ - "infrastructureName", - "etcdDiscoveryDomain", - "apiServerURL", - "apiServerInternalURI", - "controlPlaneTopology", - "infrastructureTopology" + "defaultNodeSelector", + "projectRequestMessage", + "projectRequestTemplate" ], "properties": { - "apiServerInternalURI": { - "description": "apiServerInternalURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerInternalURL can be used by components like kubelets, to contact the Kubernetes API server using the infrastructure provider rather than Kubernetes networking.", - "type": "string", - "default": "" - }, - "apiServerURL": { - "description": "apiServerURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API.", + "defaultNodeSelector": { + "description": "defaultNodeSelector holds default project node label selector", "type": "string", "default": "" }, - "controlPlaneTopology": { - "description": "controlPlaneTopology expresses the expectations for operands that normally run on control nodes. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation The 'External' mode indicates that the control plane is hosted externally to the cluster and that its components are not visible within the cluster.", + "projectRequestMessage": { + "description": "projectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint", "type": "string", "default": "" }, - "cpuPartitioning": { - "description": "cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. Valid values are \"None\" and \"AllNodes\". When omitted, the default value is \"None\". The default value of \"None\" indicates that no nodes will be setup with CPU partitioning. The \"AllNodes\" value indicates that all nodes have been setup with CPU partitioning, and can then be further configured via the PerformanceProfile API.", - "type": "string", - "default": "None" - }, - "etcdDiscoveryDomain": { - "description": "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery deprecated: as of 4.7, this field is no longer set or honored. It will be removed in a future release.", + "projectRequestTemplate": { + "description": "projectRequestTemplate is the template to use for creating projects in response to projectrequest. It is in the format namespace/template and it is optional. If it is not specified, a default template is used.", "type": "string", "default": "" - }, - "infrastructureName": { - "description": "infrastructureName uniquely identifies a cluster with a human friendly name. Once set it should not be changed. Must be of max length 27 and must have only alphanumeric or hyphen characters.", - "type": "string", - "default": "" - }, - "infrastructureTopology": { - "description": "infrastructureTopology expresses the expectations for infrastructure services that do not run on control plane nodes, usually indicated by a node selector for a `role` value other than `master`. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation NOTE: External topology mode is not applicable for this field.", - "type": "string", - "default": "" - }, - "platform": { - "description": "platform is the underlying infrastructure provider for the cluster.\n\nDeprecated: Use platformStatus.type instead.", - "type": "string" - }, - "platformStatus": { - "description": "platformStatus holds status information specific to the underlying infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.PlatformStatus" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "InfrastructureStatus", + "Kind": "ProjectConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Ingress": { - "description": "Ingress holds cluster-wide information about ingress, including the default ingress domain used for routes. The canonical name is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.RegistryLocation": { + "description": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.", "type": "object", "required": [ - "spec" + "domainName" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.IngressSpec" + "domainName": { + "description": "DomainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.", + "type": "string", + "default": "" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.IngressStatus" + "insecure": { + "description": "Insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.", + "type": "boolean" } }, "x-fabric8-info": { - "Type": "object", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "Ingress", - "Scope": "Clustered" + "Kind": "RegistryLocation", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.IngressList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.openshiftcontrolplane.v1.ResourceQuotaControllerConfig": { "type": "object", "required": [ - "metadata", - "items" + "concurrentSyncs", + "syncPeriod", + "minResyncPeriod" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Ingress" - } + "concurrentSyncs": { + "type": "integer", + "format": "int32", + "default": 0 }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "minResyncPeriod": { + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "syncPeriod": { + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "nested", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "IngressList", + "Kind": "ResourceQuotaControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IngressPlatformSpec": { - "description": "IngressPlatformSpec holds the desired state of Ingress specific to the underlying infrastructure provider of the current cluster. Since these are used at spec-level for the underlying cluster, it is supposed that only one of the spec structs is set.", + "io.openshift.config.openshiftcontrolplane.v1.RoutingConfig": { + "description": "RoutingConfig holds the necessary configuration options for routing to subdomains", "type": "object", "required": [ - "type" + "subdomain" ], "properties": { - "aws": { - "description": "aws contains settings specific to the Amazon Web Services infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AWSIngressSpec" - }, - "type": { - "description": "type is the underlying infrastructure provider for the cluster. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", \"KubeVirt\", \"EquinixMetal\", \"PowerVS\", \"AlibabaCloud\", \"Nutanix\" and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.", + "subdomain": { + "description": "subdomain is the suffix appended to $service.$namespace. to form the default route hostname DEPRECATED: This field is being replaced by routers setting their own defaults. This is the \"default\" route.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "IngressPlatformSpec", + "Kind": "RoutingConfig", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "aws": "AWS" - } - } - ] + } }, - "io.openshift.config.v1.IngressSpec": { + "io.openshift.config.openshiftcontrolplane.v1.SecurityAllocator": { + "description": "SecurityAllocator controls the automatic allocation of UIDs and MCS labels to a project. If nil, allocation is disabled.", "type": "object", "required": [ - "domain" + "uidAllocatorRange", + "mcsAllocatorRange", + "mcsLabelsPerProject" ], "properties": { - "appsDomain": { - "description": "appsDomain is an optional domain to use instead of the one specified in the domain field when a Route is created without specifying an explicit host. If appsDomain is nonempty, this value is used to generate default host values for Route. Unlike domain, appsDomain may be modified after installation. This assumes a new ingresscontroller has been setup with a wildcard certificate.", - "type": "string" - }, - "componentRoutes": { - "description": "componentRoutes is an optional list of routes that are managed by OpenShift components that a cluster-admin is able to configure the hostname and serving certificate for. The namespace and name of each route in this list should match an existing entry in the status.componentRoutes list.\n\nTo determine the set of configurable Routes, look at namespace and name of entries in the .status.componentRoutes list, where participating operators write the status of configurable routes.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ComponentRouteSpec" - }, - "x-kubernetes-list-map-keys": [ - "namespace", - "name" - ], - "x-kubernetes-list-type": "map" - }, - "domain": { - "description": "domain is used to generate a default host name for a route when the route's host name is empty. The generated host name will follow this pattern: \"\u003croute-name\u003e.\u003croute-namespace\u003e.\u003cdomain\u003e\".\n\nIt is also used as the default wildcard domain suffix for ingress. The default ingresscontroller domain will follow this pattern: \"*.\u003cdomain\u003e\".\n\nOnce set, changing domain is not currently supported.", + "mcsAllocatorRange": { + "description": "MCSAllocatorRange defines the range of MCS categories that will be assigned to namespaces. The format is \"\u003cprefix\u003e/\u003cnumberOfLabels\u003e[,\u003cmaxCategory\u003e]\". The default is \"s0/2\" and will allocate from c0 -\u003e c1023, which means a total of 535k labels are available (1024 choose 2 ~ 535k). If this value is changed after startup, new projects may receive labels that are already allocated to other projects. Prefix may be any valid SELinux set of terms (including user, role, and type), although leaving them as the default will allow the server to set them automatically.\n\nExamples: * s0:/2 - Allocate labels from s0:c0,c0 to s0:c511,c511 * s0:/2,512 - Allocate labels from s0:c0,c0,c0 to s0:c511,c511,511", "type": "string", "default": "" }, - "loadBalancer": { - "description": "loadBalancer contains the load balancer details in general which are not only specific to the underlying infrastructure provider of the current cluster and are required for Ingress Controller to work on OpenShift.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.LoadBalancer" + "mcsLabelsPerProject": { + "description": "MCSLabelsPerProject defines the number of labels that should be reserved per project. The default is 5 to match the default UID and MCS ranges (100k namespaces, 535k/5 labels).", + "type": "integer", + "format": "int32", + "default": 0 }, - "requiredHSTSPolicies": { - "description": "requiredHSTSPolicies specifies HSTS policies that are required to be set on newly created or updated routes matching the domainPattern/s and namespaceSelector/s that are specified in the policy. Each requiredHSTSPolicy must have at least a domainPattern and a maxAge to validate a route HSTS Policy route annotation, and affect route admission.\n\nA candidate route is checked for HSTS Policies if it has the HSTS Policy route annotation: \"haproxy.router.openshift.io/hsts_header\" E.g. haproxy.router.openshift.io/hsts_header: max-age=31536000;preload;includeSubDomains\n\n- For each candidate route, if it matches a requiredHSTSPolicy domainPattern and optional namespaceSelector, then the maxAge, preloadPolicy, and includeSubdomainsPolicy must be valid to be admitted. Otherwise, the route is rejected. - The first match, by domainPattern and optional namespaceSelector, in the ordering of the RequiredHSTSPolicies determines the route's admission status. - If the candidate route doesn't match any requiredHSTSPolicy domainPattern and optional namespaceSelector, then it may use any HSTS Policy annotation.\n\nThe HSTS policy configuration may be changed after routes have already been created. An update to a previously admitted route may then fail if the updated route does not conform to the updated HSTS policy configuration. However, changing the HSTS policy configuration will not cause a route that is already admitted to stop working.\n\nNote that if there are no RequiredHSTSPolicies, any HSTS Policy annotation on the route is valid.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.RequiredHSTSPolicy" - } + "uidAllocatorRange": { + "description": "UIDAllocatorRange defines the total set of Unix user IDs (UIDs) that will be allocated to projects automatically, and the size of the block each namespace gets. For example, 1000-1999/10 will allocate ten UIDs per namespace, and will be able to allocate up to 100 blocks before running out of space. The default is to allocate from 1 billion to 2 billion in 10k blocks (which is the expected size of the ranges container images will use once user namespaces are started).", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "IngressSpec", + "Kind": "SecurityAllocator", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IngressStatus": { + "io.openshift.config.openshiftcontrolplane.v1.ServiceAccountControllerConfig": { "type": "object", + "required": [ + "managedNames" + ], "properties": { - "componentRoutes": { - "description": "componentRoutes is where participating operators place the current route status for routes whose hostnames and serving certificates can be customized by the cluster-admin.", + "managedNames": { + "description": "managedNames is a list of service account names that will be auto-created in every namespace. If no names are specified, the ServiceAccountsController will not be started.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ComponentRouteStatus" - }, - "x-kubernetes-list-map-keys": [ - "namespace", - "name" - ], - "x-kubernetes-list-type": "map" - }, - "defaultPlacement": { - "description": "defaultPlacement is set at installation time to control which nodes will host the ingress router pods by default. The options are control-plane nodes or worker nodes.\n\nThis field works by dictating how the Cluster Ingress Operator will consider unset replicas and nodePlacement fields in IngressController resources when creating the corresponding Deployments.\n\nSee the documentation for the IngressController replicas and nodePlacement fields for more information.\n\nWhen omitted, the default value is Workers", - "type": "string", - "default": "" + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "IngressStatus", + "Kind": "ServiceAccountControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.IntermediateTLSProfile": { - "description": "IntermediateTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29", + "io.openshift.config.openshiftcontrolplane.v1.ServiceServingCert": { + "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", "type": "object", + "required": [ + "signer" + ], + "properties": { + "signer": { + "description": "Signer holds the signing information used to automatically sign serving certificates. If this value is nil, then certs are not signed automatically.", + "$ref": "#/definitions/io.openshift.config.v1.CertInfo" + } + }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "IntermediateTLSProfile", + "Kind": "ServiceServingCert", "Scope": "Namespaced" } }, - "io.openshift.config.v1.KeystoneIdentityProvider": { - "description": "KeystonePasswordIdentityProvider provides identities for users authenticating using keystone password credentials", + "io.openshift.config.openshiftcontrolplane.v1.SourceStrategyDefaultsConfig": { + "description": "SourceStrategyDefaultsConfig contains values that apply to builds using the source strategy.", "type": "object", - "required": [ - "url", - "domainName" - ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "domainName": { - "description": "domainName is required for keystone v3", - "type": "string", - "default": "" - }, - "tlsClientCert": { - "description": "tlsClientCert is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate to present when connecting to the server. The key \"tls.crt\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "tlsClientKey": { - "description": "tlsClientKey is an optional reference to a secret by name that contains the PEM-encoded TLS private key for the client certificate referenced in tlsClientCert. The key \"tls.key\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "url": { - "description": "url is the remote URL to connect to", - "type": "string", - "default": "" + "incremental": { + "description": "incremental indicates if s2i build strategies should perform an incremental build or not", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", - "Kind": "KeystoneIdentityProvider", + "Kind": "SourceStrategyDefaultsConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.KubeClientConfig": { + "io.openshift.config.osin.v1.AllowAllPasswordIdentityProvider": { + "description": "AllowAllPasswordIdentityProvider provides identities for users authenticating using non-empty passwords\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", - "required": [ - "kubeConfig", - "connectionOverrides" - ], "properties": { - "connectionOverrides": { - "description": "connectionOverrides specifies client overrides for system components to loop back to this master.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClientConnectionOverrides" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "kubeConfig": { - "description": "kubeConfig is a .kubeconfig filename for going to the owning kube-apiserver. Empty uses an in-cluster-config", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "KubeClientConfig", + "Kind": "AllowAllPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.KubevirtPlatformSpec": { - "description": "KubevirtPlatformSpec holds the desired state of the kubevirt infrastructure provider. This only includes fields that can be modified in the cluster.", + "io.openshift.config.osin.v1.BasicAuthPasswordIdentityProvider": { + "description": "BasicAuthPasswordIdentityProvider provides identities for users authenticating using HTTP basic auth credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "url", + "ca", + "certFile", + "keyFile" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "ca": { + "description": "CA is the CA for verifying TLS connections", + "type": "string", + "default": "" + }, + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "url": { + "description": "URL is the remote URL to connect to", + "type": "string", + "default": "" + } + }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "KubevirtPlatformSpec", + "Kind": "BasicAuthPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.KubevirtPlatformStatus": { - "description": "KubevirtPlatformStatus holds the current status of the kubevirt infrastructure provider.", + "io.openshift.config.osin.v1.DenyAllPasswordIdentityProvider": { + "description": "DenyAllPasswordIdentityProvider provides no identities for users\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "KubevirtPlatformStatus", + "Kind": "DenyAllPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.LDAPAttributeMapping": { - "description": "LDAPAttributeMapping maps LDAP attributes to OpenShift identity fields", + "io.openshift.config.osin.v1.GitHubIdentityProvider": { + "description": "GitHubIdentityProvider provides identities for users authenticating using GitHub credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "id" + "clientID", + "clientSecret", + "organizations", + "teams", + "hostname", + "ca" ], "properties": { - "email": { - "description": "email is the list of attributes whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "id": { - "description": "id is the list of attributes whose values should be used as the user ID. Required. First non-empty attribute is used. At least one attribute is required. If none of the listed attribute have a value, authentication fails. LDAP standard identity attribute is \"dn\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "ca": { + "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server. If empty, the default system roots are used. This can only be configured when hostname is set to a non-empty value.", + "type": "string", + "default": "" }, - "name": { - "description": "name is the list of attributes whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity LDAP standard display name attribute is \"cn\"", + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" + }, + "clientSecret": { + "description": "clientSecret is the oauth client secret", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.StringSource" + }, + "hostname": { + "description": "hostname is the optional domain (e.g. \"mycompany.com\") for use with a hosted instance of GitHub Enterprise. It must match the GitHub Enterprise settings value that is configured at /setup/settings#hostname.", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "organizations": { + "description": "organizations optionally restricts which organizations are allowed to log in", "type": "array", "items": { "type": "string", "default": "" } }, - "preferredUsername": { - "description": "preferredUsername is the list of attributes whose values should be used as the preferred username. LDAP standard login attribute is \"uid\"", + "teams": { + "description": "teams optionally restricts which teams are allowed to log in. Format is \u003corg\u003e/\u003cteam\u003e.", "type": "array", "items": { "type": "string", @@ -21629,224 +22158,301 @@ } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "LDAPAttributeMapping", + "Kind": "GitHubIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.LDAPIdentityProvider": { - "description": "LDAPPasswordIdentityProvider provides identities for users authenticating using LDAP credentials", + "io.openshift.config.osin.v1.GitLabIdentityProvider": { + "description": "GitLabIdentityProvider provides identities for users authenticating using GitLab credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ + "ca", "url", - "insecure", - "attributes" + "clientID", + "clientSecret" ], "properties": { - "attributes": { - "description": "attributes maps LDAP attributes to identities", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.LDAPAttributeMapping" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "bindDN": { - "description": "bindDN is an optional DN to bind with during the search phase.", + "ca": { + "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", "type": "string", "default": "" }, - "bindPassword": { - "description": "bindPassword is an optional reference to a secret by name containing a password to bind with during the search phase. The key \"bindPassword\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" }, - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", + "clientSecret": { + "description": "clientSecret is the oauth client secret", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "$ref": "#/definitions/io.openshift.config.v1.StringSource" }, - "insecure": { - "description": "insecure, if true, indicates the connection should not use TLS WARNING: Should not be set to `true` with the URL scheme \"ldaps://\" as \"ldaps://\" URLs always\n attempt to connect using TLS, even when `insecure` is set to `true`\nWhen `true`, \"ldap://\" URLS connect insecurely. When `false`, \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830.", - "type": "boolean", - "default": false + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "legacy": { + "description": "legacy determines if OAuth2 or OIDC should be used If true, OAuth2 is used If false, OIDC is used If nil and the URL's host is gitlab.com, OIDC is used Otherwise, OAuth2 is used In a future release, nil will default to using OIDC Eventually this flag will be removed and only OIDC will be used", + "type": "boolean" }, "url": { - "description": "url is an RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is: ldap://host:port/basedn?attribute?scope?filter", + "description": "url is the oauth server base URL", "type": "string", "default": "" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "LDAPIdentityProvider", + "Kind": "GitLabIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.LeaderElection": { - "description": "LeaderElection provides information to elect a leader", + "io.openshift.config.osin.v1.GoogleIdentityProvider": { + "description": "GoogleIdentityProvider provides identities for users authenticating using Google credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "leaseDuration", - "renewDeadline", - "retryPeriod" + "clientID", + "clientSecret", + "hostedDomain" ], "properties": { - "disable": { - "description": "disable allows leader election to be suspended while allowing a fully defaulted \"normal\" startup case.", - "type": "boolean" - }, - "leaseDuration": { - "description": "leaseDuration is the duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled.", - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "name": { - "description": "name indicates what name to use for the resource", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "namespace": { - "description": "namespace indicates which namespace the resource is in", - "type": "string" + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" }, - "renewDeadline": { - "description": "renewDeadline is the interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled.", - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "clientSecret": { + "description": "clientSecret is the oauth client secret", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.StringSource" }, - "retryPeriod": { - "description": "retryPeriod is the duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled.", - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "LeaderElection", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.LoadBalancer": { - "type": "object", - "properties": { - "platform": { - "description": "platform holds configuration specific to the underlying infrastructure provider for the ingress load balancers. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.IngressPlatformSpec" + "hostedDomain": { + "description": "hostedDomain is the optional Google App domain (e.g. \"mycompany.com\") to restrict logins to", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "LoadBalancer", + "Kind": "GoogleIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.MTUMigration": { - "description": "MTUMigration contains infomation about MTU migration.", + "io.openshift.config.osin.v1.GrantConfig": { + "description": "GrantConfig holds the necessary configuration options for grant handlers", "type": "object", + "required": [ + "method", + "serviceAccountMethod" + ], "properties": { - "machine": { - "description": "Machine contains MTU migration configuration for the machine's uplink.", - "$ref": "#/definitions/io.openshift.config.v1.MTUMigrationValues" + "method": { + "description": "method determines the default strategy to use when an OAuth client requests a grant. This method will be used only if the specific OAuth client doesn't provide a strategy of their own. Valid grant handling methods are:\n - auto: always approves grant requests, useful for trusted clients\n - prompt: prompts the end user for approval of grant requests, useful for third-party clients\n - deny: always denies grant requests, useful for black-listed clients", + "type": "string", + "default": "" }, - "network": { - "description": "Network contains MTU migration configuration for the default network.", - "$ref": "#/definitions/io.openshift.config.v1.MTUMigrationValues" + "serviceAccountMethod": { + "description": "serviceAccountMethod is used for determining client authorization for service account oauth client. It must be either: deny, prompt", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "MTUMigration", + "Kind": "GrantConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.MTUMigrationValues": { - "description": "MTUMigrationValues contains the values for a MTU migration.", + "io.openshift.config.osin.v1.HTPasswdPasswordIdentityProvider": { + "description": "HTPasswdPasswordIdentityProvider provides identities for users authenticating using htpasswd credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "to" + "file" ], "properties": { - "from": { - "description": "From is the MTU to migrate from.", - "type": "integer", - "format": "int64" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "to": { - "description": "To is the MTU to migrate to.", - "type": "integer", - "format": "int64" + "file": { + "description": "file is a reference to your htpasswd file", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "MTUMigrationValues", + "Kind": "HTPasswdPasswordIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.MaxAgePolicy": { - "description": "MaxAgePolicy contains a numeric range for specifying a compliant HSTS max-age for the enclosing RequiredHSTSPolicy", + "io.openshift.config.osin.v1.IdentityProvider": { + "description": "IdentityProvider provides identities for users authenticating using credentials", "type": "object", + "required": [ + "name", + "challenge", + "login", + "mappingMethod", + "provider" + ], "properties": { - "largestMaxAge": { - "description": "The largest allowed value (in seconds) of the RequiredHSTSPolicy max-age This value can be left unspecified, in which case no upper limit is enforced.", - "type": "integer", - "format": "int32" + "challenge": { + "description": "challenge indicates whether to issue WWW-Authenticate challenges for this provider", + "type": "boolean", + "default": false }, - "smallestMaxAge": { - "description": "The smallest allowed value (in seconds) of the RequiredHSTSPolicy max-age Setting max-age=0 allows the deletion of an existing HSTS header from a host. This is a necessary tool for administrators to quickly correct mistakes. This value can be left unspecified, in which case no lower limit is enforced.", - "type": "integer", - "format": "int32" + "login": { + "description": "login indicates whether to use this identity provider for unauthenticated browsers to login against", + "type": "boolean", + "default": false + }, + "mappingMethod": { + "description": "mappingMethod determines how identities from this provider are mapped to users", + "type": "string", + "default": "" + }, + "name": { + "description": "name is used to qualify the identities returned by this provider", + "type": "string", + "default": "" + }, + "provider": { + "description": "provider contains the information about how to set up a specific identity provider", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "MaxAgePolicy", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ModernTLSProfile": { - "description": "ModernTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "ModernTLSProfile", + "Kind": "IdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NamedCertificate": { - "description": "NamedCertificate specifies a certificate/key, and the names it should be served for", + "io.openshift.config.osin.v1.KeystonePasswordIdentityProvider": { + "description": "KeystonePasswordIdentityProvider provides identities for users authenticating using keystone password credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ + "url", + "ca", "certFile", - "keyFile" + "keyFile", + "domainName", + "useKeystoneIdentity" ], "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "ca": { + "description": "CA is the CA for verifying TLS connections", + "type": "string", + "default": "" + }, "certFile": { "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, + "domainName": { + "description": "domainName is required for keystone v3", + "type": "string", + "default": "" + }, "keyFile": { "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" }, - "names": { - "description": "Names is a list of DNS names this certificate should be used to secure A name can be a normal DNS name, or can contain leading wildcard segments.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "url": { + "description": "URL is the remote URL to connect to", + "type": "string", + "default": "" + }, + "useKeystoneIdentity": { + "description": "useKeystoneIdentity flag indicates that user should be authenticated by keystone ID, not by username", + "type": "boolean", + "default": false + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "osin.config.openshift.io", + "Version": "v1", + "Kind": "KeystonePasswordIdentityProvider", + "Scope": "Namespaced" + } + }, + "io.openshift.config.osin.v1.LDAPAttributeMapping": { + "description": "LDAPAttributeMapping maps LDAP attributes to OpenShift identity fields", + "type": "object", + "required": [ + "id", + "preferredUsername", + "name", + "email" + ], + "properties": { + "email": { + "description": "email is the list of attributes whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "id": { + "description": "id is the list of attributes whose values should be used as the user ID. Required. LDAP standard identity attribute is \"dn\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "name": { + "description": "name is the list of attributes whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity LDAP standard display name attribute is \"cn\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "preferredUsername": { + "description": "preferredUsername is the list of attributes whose values should be used as the preferred username. LDAP standard login attribute is \"uid\"", "type": "array", "items": { "type": "string", @@ -21856,313 +22462,634 @@ }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NamedCertificate", + "Kind": "LDAPAttributeMapping", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Network": { - "description": "Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc. Please view network.spec for an explanation on what applies when configuring this resource.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.osin.v1.LDAPPasswordIdentityProvider": { + "description": "LDAPPasswordIdentityProvider provides identities for users authenticating using LDAP credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "url", + "bindDN", + "bindPassword", + "insecure", + "ca", + "attributes" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "attributes": { + "description": "attributes maps LDAP attributes to identities", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.osin.v1.LDAPAttributeMapping" }, - "spec": { - "description": "spec holds user settable values for configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NetworkSpec" + "bindDN": { + "description": "bindDN is an optional DN to bind with during the search phase.", + "type": "string", + "default": "" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "bindPassword": { + "description": "bindPassword is an optional password to bind with during the search phase.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NetworkStatus" + "$ref": "#/definitions/io.openshift.config.v1.StringSource" + }, + "ca": { + "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", + "type": "string", + "default": "" + }, + "insecure": { + "description": "insecure, if true, indicates the connection should not use TLS. Cannot be set to true with a URL scheme of \"ldaps://\" If false, \"ldaps://\" URLs connect using TLS, and \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830", + "type": "boolean", + "default": false + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "url": { + "description": "url is an RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is\n ldap://host:port/basedn?attribute?scope?filter", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "Network", - "Scope": "Clustered" + "Kind": "LDAPPasswordIdentityProvider", + "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkDiagnostics": { + "io.openshift.config.osin.v1.OAuthConfig": { + "description": "OAuthConfig holds the necessary configuration options for OAuth authentication", "type": "object", + "required": [ + "masterCA", + "masterURL", + "masterPublicURL", + "loginURL", + "assetPublicURL", + "alwaysShowProviderSelection", + "identityProviders", + "grantConfig", + "sessionConfig", + "tokenConfig", + "templates" + ], "properties": { - "mode": { - "description": "mode controls the network diagnostics mode\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is All.", + "alwaysShowProviderSelection": { + "description": "alwaysShowProviderSelection will force the provider selection page to render even when there is only a single provider.", + "type": "boolean", + "default": false + }, + "assetPublicURL": { + "description": "assetPublicURL is used for building valid client redirect URLs for external access", "type": "string", "default": "" }, - "sourcePlacement": { - "description": "sourcePlacement controls the scheduling of network diagnostics source deployment\n\nSee NetworkDiagnosticsSourcePlacement for more details about default values.", + "grantConfig": { + "description": "grantConfig describes how to handle grants", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NetworkDiagnosticsSourcePlacement" + "$ref": "#/definitions/io.openshift.config.osin.v1.GrantConfig" }, - "targetPlacement": { - "description": "targetPlacement controls the scheduling of network diagnostics target daemonset\n\nSee NetworkDiagnosticsTargetPlacement for more details about default values.", + "identityProviders": { + "description": "identityProviders is an ordered list of ways for a user to identify themselves", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.osin.v1.IdentityProvider" + } + }, + "loginURL": { + "description": "loginURL, along with masterCA, masterURL and masterPublicURL have distinct meanings depending on how the OAuth server is run. The two states are: 1. embedded in the kube api server (all 3.x releases) 2. as a standalone external process (all 4.x releases) in the embedded configuration, loginURL is equivalent to masterPublicURL and the other fields have functionality that matches their docs. in the standalone configuration, the fields are used as: loginURL is the URL required to login to the cluster: oc login --server=\u003cloginURL\u003e masterPublicURL is the issuer URL it is accessible from inside (service network) and outside (ingress) of the cluster masterURL is the loopback variation of the token_endpoint URL with no path component it is only accessible from inside (service network) of the cluster masterCA is used to perform TLS verification for connections made to masterURL For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2", + "type": "string", + "default": "" + }, + "masterCA": { + "description": "masterCA is the CA for verifying the TLS connection back to the MasterURL. This field is deprecated and will be removed in a future release. See loginURL for details. Deprecated", + "type": "string" + }, + "masterPublicURL": { + "description": "masterPublicURL is used for building valid client redirect URLs for internal and external access This field is deprecated and will be removed in a future release. See loginURL for details. Deprecated", + "type": "string", + "default": "" + }, + "masterURL": { + "description": "masterURL is used for making server-to-server calls to exchange authorization codes for access tokens This field is deprecated and will be removed in a future release. See loginURL for details. Deprecated", + "type": "string", + "default": "" + }, + "sessionConfig": { + "description": "sessionConfig hold information about configuring sessions.", + "$ref": "#/definitions/io.openshift.config.osin.v1.SessionConfig" + }, + "templates": { + "description": "templates allow you to customize pages like the login page.", + "$ref": "#/definitions/io.openshift.config.osin.v1.OAuthTemplates" + }, + "tokenConfig": { + "description": "tokenConfig contains options for authorization and access tokens", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NetworkDiagnosticsTargetPlacement" + "$ref": "#/definitions/io.openshift.config.osin.v1.TokenConfig" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkDiagnostics", + "Kind": "OAuthConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkDiagnosticsSourcePlacement": { - "description": "NetworkDiagnosticsSourcePlacement defines node scheduling configuration network diagnostics source components", + "io.openshift.config.osin.v1.OAuthTemplates": { + "description": "OAuthTemplates allow for customization of pages like the login page", "type": "object", + "required": [ + "login", + "providerSelection", + "error" + ], "properties": { - "nodeSelector": { - "description": "nodeSelector is the node selector applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `kubernetes.io/os: linux`.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "error": { + "description": "error is a path to a file containing a go template used to render error pages during the authentication or grant flow If unspecified, the default error page is used.", + "type": "string", + "default": "" }, - "tolerations": { - "description": "tolerations is a list of tolerations applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is an empty list.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" - }, - "x-kubernetes-list-type": "atomic" + "login": { + "description": "login is a path to a file containing a go template used to render the login page. If unspecified, the default login page is used.", + "type": "string", + "default": "" + }, + "providerSelection": { + "description": "providerSelection is a path to a file containing a go template used to render the provider selection page. If unspecified, the default provider selection page is used.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkDiagnosticsSourcePlacement", + "Kind": "OAuthTemplates", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkDiagnosticsTargetPlacement": { - "description": "NetworkDiagnosticsTargetPlacement defines node scheduling configuration network diagnostics target components", + "io.openshift.config.osin.v1.OpenIDClaims": { + "description": "OpenIDClaims contains a list of OpenID claims to use when authenticating with an OpenID identity provider", "type": "object", + "required": [ + "id", + "preferredUsername", + "name", + "email", + "groups" + ], "properties": { - "nodeSelector": { - "description": "nodeSelector is the node selector applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `kubernetes.io/os: linux`.", - "type": "object", - "additionalProperties": { + "email": { + "description": "email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", + "type": "array", + "items": { "type": "string", "default": "" } }, - "tolerations": { - "description": "tolerations is a list of tolerations applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `- operator: \"Exists\"` which means that all taints are tolerated.", + "groups": { + "description": "groups is the list of claims value of which should be used to synchronize groups from the OIDC provider to OpenShift for the user", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" - }, - "x-kubernetes-list-type": "atomic" + "type": "string", + "default": "" + } + }, + "id": { + "description": "id is the list of claims whose values should be used as the user ID. Required. OpenID standard identity claim is \"sub\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "name": { + "description": "name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "preferredUsername": { + "description": "preferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the id claim", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkDiagnosticsTargetPlacement", + "Kind": "OpenIDClaims", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.osin.v1.OpenIDIdentityProvider": { + "description": "OpenIDIdentityProvider provides identities for users authenticating using OpenID credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "metadata", - "items" + "ca", + "clientID", + "clientSecret", + "extraScopes", + "extraAuthorizeParameters", + "urls", + "claims" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "items": { + "ca": { + "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", + "type": "string", + "default": "" + }, + "claims": { + "description": "claims mappings", + "default": {}, + "$ref": "#/definitions/io.openshift.config.osin.v1.OpenIDClaims" + }, + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" + }, + "clientSecret": { + "description": "clientSecret is the oauth client secret", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.StringSource" + }, + "extraAuthorizeParameters": { + "description": "extraAuthorizeParameters are any custom parameters to add to the authorize request.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "extraScopes": { + "description": "extraScopes are any scopes to request in addition to the standard \"openid\" scope.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Network" + "type": "string", + "default": "" } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "urls": { + "description": "urls to use to authenticate", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.openshift.config.osin.v1.OpenIDURLs" } }, "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", + "Type": "object", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkList", + "Kind": "OpenIDIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkMigration": { - "description": "NetworkMigration represents the network migration status.", + "io.openshift.config.osin.v1.OpenIDURLs": { + "description": "OpenIDURLs are URLs to use when authenticating with an OpenID identity provider", "type": "object", - "properties": { - "mtu": { - "description": "MTU is the MTU configuration that is being deployed.", - "$ref": "#/definitions/io.openshift.config.v1.MTUMigration" + "required": [ + "authorize", + "token", + "userInfo" + ], + "properties": { + "authorize": { + "description": "authorize is the oauth authorization URL", + "type": "string", + "default": "" }, - "networkType": { - "description": "NetworkType is the target plugin that is being deployed. DEPRECATED: network type migration is no longer supported, so this should always be unset.", - "type": "string" + "token": { + "description": "token is the oauth token granting URL", + "type": "string", + "default": "" + }, + "userInfo": { + "description": "userInfo is the optional userinfo URL. If present, a granted access_token is used to request claims If empty, a granted id_token is parsed for claims", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkMigration", + "Kind": "OpenIDURLs", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkSpec": { - "description": "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.", + "io.openshift.config.osin.v1.OsinServerConfig": { + "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "clusterNetwork", - "serviceNetwork", - "networkType" + "servingInfo", + "corsAllowedOrigins", + "auditConfig", + "storageConfig", + "admission", + "kubeClientConfig", + "oauthConfig" ], "properties": { - "clusterNetwork": { - "description": "IP address pool to use for pod IPs. This field is immutable after installation.", + "admission": { + "description": "admissionConfig holds information about how to configure admission.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" + }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "auditConfig": { + "description": "auditConfig describes how to configure audit information", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" + }, + "corsAllowedOrigins": { + "description": "corsAllowedOrigins", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterNetworkEntry" - }, - "x-kubernetes-list-type": "atomic" + "type": "string", + "default": "" + } }, - "externalIP": { - "description": "externalIP defines configuration for controllers that affect Service.ExternalIP. If nil, then ExternalIP is not allowed to be set.", - "$ref": "#/definitions/io.openshift.config.v1.ExternalIPConfig" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "networkDiagnostics": { - "description": "networkDiagnostics defines network diagnostics configuration.\n\nTakes precedence over spec.disableNetworkDiagnostics in network.operator.openshift.io. If networkDiagnostics is not specified or is empty, and the spec.disableNetworkDiagnostics flag in network.operator.openshift.io is set to true, the network diagnostics feature will be disabled.", + "kubeClientConfig": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NetworkDiagnostics" + "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" }, - "networkType": { - "description": "NetworkType is the plugin that is to be deployed (e.g. OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OVNKubernetes This field is immutable after installation.", + "oauthConfig": { + "description": "oauthConfig holds the necessary configuration options for OAuth authentication", + "default": {}, + "$ref": "#/definitions/io.openshift.config.osin.v1.OAuthConfig" + }, + "servingInfo": { + "description": "servingInfo describes how to start serving", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + }, + "storageConfig": { + "description": "storageConfig contains information about how to use", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "osin.config.openshift.io", + "Version": "v1", + "Kind": "OsinServerConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.osin.v1.RequestHeaderIdentityProvider": { + "description": "RequestHeaderIdentityProvider provides identities for users authenticating using request header credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "loginURL", + "challengeURL", + "clientCA", + "clientCommonNames", + "headers", + "preferredUsernameHeaders", + "nameHeaders", + "emailHeaders" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "challengeURL": { + "description": "challengeURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect WWW-Authenticate challenges will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", "type": "string", "default": "" }, - "serviceNetwork": { - "description": "IP address pool for services. Currently, we only support a single entry here. This field is immutable after installation.", + "clientCA": { + "description": "clientCA is a file with the trusted signer certs. If empty, no request verification is done, and any direct request to the OAuth server can impersonate any identity from this provider, merely by setting a request header.", + "type": "string", + "default": "" + }, + "clientCommonNames": { + "description": "clientCommonNames is an optional list of common names to require a match from. If empty, any client certificate validated against the clientCA bundle is considered authoritative.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "serviceNodePortRange": { - "description": "The port range allowed for Services of type NodePort. If not specified, the default of 30000-32767 will be used. Such Services without a NodePort specified will have one automatically allocated from this range. This parameter can be updated after the cluster is installed.", + "emailHeaders": { + "description": "emailHeaders is the set of headers to check for the email address", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "headers": { + "description": "headers is the set of headers to check for identity information", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "loginURL": { + "description": "loginURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect interactive logins will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", + "type": "string", + "default": "" + }, + "nameHeaders": { + "description": "nameHeaders is the set of headers to check for the display name", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "preferredUsernameHeaders": { + "description": "preferredUsernameHeaders is the set of headers to check for the preferred username", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "osin.config.openshift.io", + "Version": "v1", + "Kind": "RequestHeaderIdentityProvider", + "Scope": "Namespaced" + } + }, + "io.openshift.config.osin.v1.SessionConfig": { + "description": "SessionConfig specifies options for cookie-based sessions. Used by AuthRequestHandlerSession", + "type": "object", + "required": [ + "sessionSecretsFile", + "sessionMaxAgeSeconds", + "sessionName" + ], + "properties": { + "sessionMaxAgeSeconds": { + "description": "sessionMaxAgeSeconds specifies how long created sessions last. Used by AuthRequestHandlerSession", + "type": "integer", + "format": "int32", + "default": 0 + }, + "sessionName": { + "description": "sessionName is the cookie name used to store the session", + "type": "string", + "default": "" + }, + "sessionSecretsFile": { + "description": "sessionSecretsFile is a reference to a file containing a serialized SessionSecrets object If no file is specified, a random signing and encryption key are generated at each server start", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkSpec", + "Kind": "SessionConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NetworkStatus": { - "description": "NetworkStatus is the current network configuration.", + "io.openshift.config.osin.v1.SessionSecret": { + "description": "SessionSecret is a secret used to authenticate/decrypt cookie-based sessions", "type": "object", + "required": [ + "authentication", + "encryption" + ], "properties": { - "clusterNetwork": { - "description": "IP address pool to use for pod IPs.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ClusterNetworkEntry" - }, - "x-kubernetes-list-type": "atomic" + "authentication": { + "description": "Authentication is used to authenticate sessions using HMAC. Recommended to use a secret with 32 or 64 bytes.", + "type": "string", + "default": "" }, - "clusterNetworkMTU": { - "description": "ClusterNetworkMTU is the MTU for inter-pod networking.", - "type": "integer", - "format": "int32" + "encryption": { + "description": "Encryption is used to encrypt sessions. Must be 16, 24, or 32 characters long, to select AES-128, AES-", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "osin.config.openshift.io", + "Version": "v1", + "Kind": "SessionSecret", + "Scope": "Namespaced" + } + }, + "io.openshift.config.osin.v1.SessionSecrets": { + "description": "SessionSecrets list the secrets to use to sign/encrypt and authenticate/decrypt created sessions.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "secrets" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "conditions": { - "description": "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkDiagnosticsAvailable\"", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "secrets": { + "description": "Secrets is a list of secrets New sessions are signed and encrypted using the first secret. Existing sessions are decrypted/authenticated by each secret until one succeeds. This allows rotating secrets.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "$ref": "#/definitions/io.openshift.config.osin.v1.SessionSecret" + } + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "osin.config.openshift.io", + "Version": "v1", + "Kind": "SessionSecrets", + "Scope": "Namespaced" + } + }, + "io.openshift.config.osin.v1.TokenConfig": { + "description": "TokenConfig holds the necessary configuration options for authorization and access tokens", + "type": "object", + "properties": { + "accessTokenInactivityTimeout": { + "description": "accessTokenInactivityTimeout defines the token inactivity timeout for tokens granted by any client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. Takes valid time duration string such as \"5m\", \"1.5h\" or \"2h45m\". The minimum allowed value for duration is 300s (5 minutes). If the timeout is configured per client, then that value takes precedence. If the timeout value is not specified and the client does not override the value, then tokens are valid until their lifetime.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "migration": { - "description": "Migration contains the cluster network migration configuration.", - "$ref": "#/definitions/io.openshift.config.v1.NetworkMigration" + "accessTokenInactivityTimeoutSeconds": { + "description": "accessTokenInactivityTimeoutSeconds - DEPRECATED: setting this field has no effect.", + "type": "integer", + "format": "int32" }, - "networkType": { - "description": "NetworkType is the plugin that is deployed (e.g. OVNKubernetes).", - "type": "string" + "accessTokenMaxAgeSeconds": { + "description": "accessTokenMaxAgeSeconds defines the maximum age of access tokens", + "type": "integer", + "format": "int32" }, - "serviceNetwork": { - "description": "IP address pool for services. Currently, we only support a single entry here.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "authorizeTokenMaxAgeSeconds": { + "description": "authorizeTokenMaxAgeSeconds defines the maximum age of authorize tokens", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", + "Group": "osin.config.openshift.io", "Version": "v1", - "Kind": "NetworkStatus", + "Kind": "TokenConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Node": { - "description": "Node holds cluster-wide information about node specific features.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfig": { + "description": "ServiceCertSignerOperatorConfig provides information to configure an operator to manage the service cert signing controllers\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "spec" + "metadata", + "spec", + "status" ], "properties": { "apiVersion": { @@ -22179,29 +23106,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NodeSpec" + "$ref": "#/definitions/io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigSpec" }, "status": { - "description": "status holds observed values.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NodeStatus" + "$ref": "#/definitions/io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "Node", + "Group": "servicecertsigner.config.openshift.io", + "Version": "v1alpha1", + "Kind": "ServiceCertSignerOperatorConfig", "Scope": "Clustered" } }, - "io.openshift.config.v1.NodeList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigList": { + "description": "ServiceCertSignerOperatorConfigList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "metadata", "items" ], "properties": { @@ -22210,10 +23134,11 @@ "type": "string" }, "items": { + "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Node" + "$ref": "#/definitions/io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfig" } }, "kind": { @@ -22228,301 +23153,117 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NodeList", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.NodeSpec": { - "type": "object", - "properties": { - "cgroupMode": { - "description": "CgroupMode determines the cgroups version on the node", - "type": "string" - }, - "workerLatencyProfile": { - "description": "WorkerLatencyProfile determins the how fast the kubelet is updating the status and corresponding reaction of the cluster", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NodeSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.NodeStatus": { - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NodeStatus", + "Group": "servicecertsigner.config.openshift.io", + "Version": "v1alpha1", + "Kind": "ServiceCertSignerOperatorConfigList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NutanixFailureDomain": { - "description": "NutanixFailureDomain configures failure domain information for the Nutanix platform.", + "io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigSpec": { "type": "object", "required": [ - "name", - "cluster", - "subnets" + "managementState" ], "properties": { - "cluster": { - "description": "cluster is to identify the cluster (the Prism Element under management of the Prism Central), in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NutanixResourceIdentifier" + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "name": { - "description": "name defines the unique name of a failure domain. Name is required and must be at most 64 characters in length. It must consist of only lower case alphanumeric characters and hyphens (-). It must start and end with an alphanumeric character. This value is arbitrary and is used to identify the failure domain within the platform.", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" }, - "subnets": { - "description": "subnets holds a list of identifiers (one or more) of the cluster's network subnets for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NutanixResourceIdentifier" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixFailureDomain", + "Group": "servicecertsigner.config.openshift.io", + "Version": "v1alpha1", + "Kind": "ServiceCertSignerOperatorConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NutanixPlatformLoadBalancer": { - "description": "NutanixPlatformLoadBalancer defines the load balancer used by the cluster on Nutanix platform.", - "type": "object", - "properties": { - "type": { - "description": "type defines the type of load balancer used by the cluster on Nutanix platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", - "type": "string", - "default": "OpenShiftManagedDefault" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixPlatformLoadBalancer", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": {} - } - ] - }, - "io.openshift.config.v1.NutanixPlatformSpec": { - "description": "NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. This only includes fields that can be modified in the cluster.", + "io.openshift.config.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigStatus": { "type": "object", "required": [ - "prismCentral", - "prismElements" + "readyReplicas" ], "properties": { - "failureDomains": { - "description": "failureDomains configures failure domains information for the Nutanix platform. When set, the failure domains defined here may be used to spread Machines across prism element clusters to improve fault tolerance of the cluster.", + "conditions": { + "description": "conditions is a list of conditions and their status", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NutanixFailureDomain" + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" }, "x-kubernetes-list-map-keys": [ - "name" + "type" ], "x-kubernetes-list-type": "map" }, - "prismCentral": { - "description": "prismCentral holds the endpoint address and port to access the Nutanix Prism Central. When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NutanixPrismEndpoint" - }, - "prismElements": { - "description": "prismElements holds one or more endpoint address and port data to access the Nutanix Prism Elements (clusters) of the Nutanix Prism Central. Currently we only support one Prism Element (cluster) for an OpenShift cluster, where all the Nutanix resources (VMs, subnets, volumes, etc.) used in the OpenShift cluster are located. In the future, we may support Nutanix resources (VMs, etc.) spread over multiple Prism Elements (clusters) of the Prism Central.", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NutanixPrismElementEndpoint" + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", "name" ], "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixPlatformSpec", + "Group": "servicecertsigner.config.openshift.io", + "Version": "v1alpha1", + "Kind": "ServiceCertSignerOperatorConfigStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.NutanixPlatformStatus": { - "description": "NutanixPlatformStatus holds the current status of the Nutanix infrastructure provider.", + "io.openshift.config.v1.APIServer": { + "description": "APIServer holds configuration (like serving certificates, client CA and CORS domains) shared by all API servers in the system, among them especially kube-apiserver and openshift-apiserver. The canonical name of an instance is 'cluster'.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "apiServerInternalIPs", - "ingressIPs" - ], - "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", - "type": "string" - }, - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", - "type": "string" - }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "loadBalancer": { - "description": "loadBalancer defines how the load balancer used by the cluster is configured.", - "default": { - "type": "OpenShiftManagedDefault" - }, - "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformLoadBalancer" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixPlatformStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.NutanixPrismElementEndpoint": { - "description": "NutanixPrismElementEndpoint holds the name and endpoint data for a Prism Element (cluster)", - "type": "object", - "required": [ - "name", - "endpoint" - ], - "properties": { - "endpoint": { - "description": "endpoint holds the endpoint address and port data of the Prism Element (cluster). When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NutanixPrismEndpoint" - }, - "name": { - "description": "name is the name of the Prism Element (cluster). This value will correspond with the cluster field configured on other resources (eg Machines, PVCs, etc).", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixPrismElementEndpoint", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.NutanixPrismEndpoint": { - "description": "NutanixPrismEndpoint holds the endpoint address and port to access the Nutanix Prism Central or Element (cluster)", - "type": "object", - "required": [ - "address", - "port" - ], - "properties": { - "address": { - "description": "address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster)", - "type": "string", - "default": "" - }, - "port": { - "description": "port is the port number to access the Nutanix Prism Central or Element (cluster)", - "type": "integer", - "format": "int32", - "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixPrismEndpoint", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.NutanixResourceIdentifier": { - "description": "NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, etc.)", - "type": "object", - "required": [ - "type" - ], - "properties": { - "name": { - "description": "name is the resource name in the PC. It cannot be empty if the type is Name.", - "type": "string" - }, - "type": { - "description": "type is the identifier type to use for this resource.", - "type": "string", - "default": "" - }, - "uuid": { - "description": "uuid is the UUID of the resource in the PC. It cannot be empty if the type is UUID.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "NutanixResourceIdentifier", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "name": "Name", - "uuid": "UUID" - } - } - ] - }, - "io.openshift.config.v1.OAuth": { - "description": "OAuth holds cluster-wide information about OAuth. The canonical name is `cluster`. It is used to configure the integrated OAuth server. This configuration is only honored when the top level Authentication config has type set to IntegratedOAuth.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "spec" + "spec" ], "properties": { "apiVersion": { @@ -22541,23 +23282,39 @@ "spec": { "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OAuthSpec" + "$ref": "#/definitions/io.openshift.config.v1.APIServerSpec" }, "status": { "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OAuthStatus" + "$ref": "#/definitions/io.openshift.config.v1.APIServerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OAuth", + "Kind": "APIServer", "Scope": "Clustered" } }, - "io.openshift.config.v1.OAuthList": { + "io.openshift.config.v1.APIServerEncryption": { + "type": "object", + "properties": { + "type": { + "description": "type defines what encryption type should be used to encrypt resources at the datastore layer. When this field is unset (i.e. when it is set to the empty string), identity is implied. The behavior of unset can and will change over time. Even if encryption is enabled by default, the meaning of unset may change to a different encryption type based on changes in best practices.\n\nWhen encryption is enabled, all sensitive resources shipped with the platform are encrypted. This list of sensitive resources can and will change over time. The current authoritative list is:\n\n 1. secrets\n 2. configmaps\n 3. routes.route.openshift.io\n 4. oauthaccesstokens.oauth.openshift.io\n 5. oauthauthorizetokens.oauth.openshift.io", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "APIServerEncryption", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.APIServerList": { "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ @@ -22573,7 +23330,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OAuth" + "$ref": "#/definitions/io.openshift.config.v1.APIServer" } }, "kind": { @@ -22590,342 +23347,257 @@ "Type": "list", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OAuthList", + "Kind": "APIServerList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OAuthRemoteConnectionInfo": { - "description": "OAuthRemoteConnectionInfo holds information necessary for establishing a remote connection", + "io.openshift.config.v1.APIServerNamedServingCert": { + "description": "APIServerNamedServingCert maps a server DNS name, as understood by a client, to a certificate.", "type": "object", "required": [ - "url" + "servingCertificate" ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "tlsClientCert": { - "description": "tlsClientCert is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate to present when connecting to the server. The key \"tls.crt\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "names": { + "description": "names is a optional list of explicit DNS names (leading wildcards allowed) that should use this certificate to serve secure traffic. If no names are provided, the implicit names will be extracted from the certificates. Exact names trump over wildcard names. Explicit names defined here trump over extracted implicit names.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "tlsClientKey": { - "description": "tlsClientKey is an optional reference to a secret by name that contains the PEM-encoded TLS private key for the client certificate referenced in tlsClientCert. The key \"tls.key\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "servingCertificate": { + "description": "servingCertificate references a kubernetes.io/tls type secret containing the TLS cert info for serving secure traffic. The secret must exist in the openshift-config namespace and contain the following required fields: - Secret.Data[\"tls.key\"] - TLS private key. - Secret.Data[\"tls.crt\"] - TLS certificate.", "default": {}, "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "url": { - "description": "url is the remote URL to connect to", - "type": "string", - "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OAuthRemoteConnectionInfo", + "Kind": "APIServerNamedServingCert", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OAuthSpec": { - "description": "OAuthSpec contains desired cluster auth configuration", + "io.openshift.config.v1.APIServerServingCerts": { "type": "object", - "required": [ - "tokenConfig" - ], "properties": { - "identityProviders": { - "description": "identityProviders is an ordered list of ways for a user to identify themselves. When this list is empty, no identities are provisioned for users.", + "namedCertificates": { + "description": "namedCertificates references secrets containing the TLS cert info for serving secure traffic to specific hostnames. If no named certificates are provided, or no named certificates match the server name as understood by a client, the defaultServingCertificate will be used.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.IdentityProvider" - }, - "x-kubernetes-list-type": "atomic" + "$ref": "#/definitions/io.openshift.config.v1.APIServerNamedServingCert" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "APIServerServingCerts", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.APIServerSpec": { + "type": "object", + "properties": { + "additionalCORSAllowedOrigins": { + "description": "additionalCORSAllowedOrigins lists additional, user-defined regular expressions describing hosts for which the API server allows access using the CORS headers. This may be needed to access the API and the integrated OAuth server from JavaScript applications. The values are regular expressions that correspond to the Golang regular expression language.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "templates": { - "description": "templates allow you to customize pages like the login page.", + "audit": { + "description": "audit specifies the settings for audit configuration to be applied to all OpenShift-provided API servers in the cluster.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OAuthTemplates" + "$ref": "#/definitions/io.openshift.config.v1.Audit" }, - "tokenConfig": { - "description": "tokenConfig contains options for authorization and access tokens", + "clientCA": { + "description": "clientCA references a ConfigMap containing a certificate bundle for the signers that will be recognized for incoming client certificates in addition to the operator managed signers. If this is empty, then only operator managed signers are valid. You usually only have to set this if you have your own PKI you wish to honor client certificates from. The ConfigMap must exist in the openshift-config namespace and contain the following required fields: - ConfigMap.Data[\"ca-bundle.crt\"] - CA bundle.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TokenConfig" + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "encryption": { + "description": "encryption allows the configuration of encryption of resources at the datastore layer.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.APIServerEncryption" + }, + "servingCerts": { + "description": "servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates will be used for serving secure traffic.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.APIServerServingCerts" + }, + "tlsSecurityProfile": { + "description": "tlsSecurityProfile specifies settings for TLS connections for externally exposed servers.\n\nIf unset, a default (which may change between releases) is chosen. Note that only Old, Intermediate and Custom profiles are currently supported, and the maximum available minTLSVersion is VersionTLS12.", + "$ref": "#/definitions/io.openshift.config.v1.TLSSecurityProfile" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OAuthSpec", + "Kind": "APIServerSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OAuthStatus": { - "description": "OAuthStatus shows current known state of OAuth server in the cluster", + "io.openshift.config.v1.APIServerStatus": { "type": "object", "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OAuthStatus", + "Kind": "APIServerStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OAuthTemplates": { - "description": "OAuthTemplates allow for customization of pages like the login page", + "io.openshift.config.v1.AWSDNSSpec": { + "description": "AWSDNSSpec contains DNS configuration specific to the Amazon Web Services cloud provider.", "type": "object", "properties": { - "error": { - "description": "error is the name of a secret that specifies a go template to use to render error pages during the authentication or grant flow. The key \"errors.html\" is used to locate the template data. If specified and the secret or expected key is not found, the default error page is used. If the specified template is not valid, the default error page is used. If unspecified, the default error page is used. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "login": { - "description": "login is the name of a secret that specifies a go template to use to render the login page. The key \"login.html\" is used to locate the template data. If specified and the secret or expected key is not found, the default login page is used. If the specified template is not valid, the default login page is used. If unspecified, the default login page is used. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "providerSelection": { - "description": "providerSelection is the name of a secret that specifies a go template to use to render the provider selection page. The key \"providers.html\" is used to locate the template data. If specified and the secret or expected key is not found, the default provider selection page is used. If the specified template is not valid, the default provider selection page is used. If unspecified, the default provider selection page is used. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "privateZoneIAMRole": { + "description": "privateZoneIAMRole contains the ARN of an IAM role that should be assumed when performing operations on the cluster's private hosted zone specified in the cluster DNS config. When left empty, no role should be assumed.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OAuthTemplates", + "Kind": "AWSDNSSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OIDCClientConfig": { + "io.openshift.config.v1.AWSIngressSpec": { + "description": "AWSIngressSpec holds the desired state of the Ingress for Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", - "required": [ - "componentName", - "componentNamespace", - "clientID", - "clientSecret", - "extraScopes" - ], "properties": { - "clientID": { - "description": "ClientID is the identifier of the OIDC client from the OIDC provider", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "ClientSecret refers to a secret in the `openshift-config` namespace that contains the client secret in the `clientSecret` key of the `.data` field", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "componentName": { - "description": "ComponentName is the name of the component that is supposed to consume this client configuration", - "type": "string", - "default": "" - }, - "componentNamespace": { - "description": "ComponentNamespace is the namespace of the component that is supposed to consume this client configuration", - "type": "string", - "default": "" - }, - "extraScopes": { - "description": "ExtraScopes is an optional set of scopes to request tokens with.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "type": { + "description": "type allows user to set a load balancer type. When this field is set the default ingresscontroller will get created using the specified LBType. If this field is not set then the default ingress controller of LBType Classic will be created. Valid values are:\n\n* \"Classic\": A Classic Load Balancer that makes routing decisions at either\n the transport layer (TCP/SSL) or the application layer (HTTP/HTTPS). See\n the following for additional details:\n\n https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#clb\n\n* \"NLB\": A Network Load Balancer that makes routing decisions at the\n transport layer (TCP/SSL). See the following for additional details:\n\n https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#nlb", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OIDCClientConfig", + "Kind": "AWSIngressSpec", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": {} + } + ] }, - "io.openshift.config.v1.OIDCClientReference": { + "io.openshift.config.v1.AWSPlatformSpec": { + "description": "AWSPlatformSpec holds the desired state of the Amazon Web Services infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", - "required": [ - "oidcProviderName", - "issuerURL", - "clientID" - ], "properties": { - "clientID": { - "description": "ClientID is the identifier of the OIDC client from the OIDC provider", - "type": "string", - "default": "" - }, - "issuerURL": { - "description": "URL is the serving URL of the token issuer. Must use the https:// scheme.", - "type": "string", - "default": "" - }, - "oidcProviderName": { - "description": "OIDCName refers to the `name` of the provider from `oidcProviders`", - "type": "string", - "default": "" + "serviceEndpoints": { + "description": "serviceEndpoints list contains custom endpoints which will override default service endpoint of AWS Services. There must be only one ServiceEndpoint for a service.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AWSServiceEndpoint" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OIDCClientReference", + "Kind": "AWSPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OIDCClientStatus": { + "io.openshift.config.v1.AWSPlatformStatus": { + "description": "AWSPlatformStatus holds the current status of the Amazon Web Services infrastructure provider.", "type": "object", "required": [ - "componentName", - "componentNamespace", - "currentOIDCClients", - "consumingUsers" + "region" ], "properties": { - "componentName": { - "description": "ComponentName is the name of the component that will consume a client configuration.", - "type": "string", - "default": "" - }, - "componentNamespace": { - "description": "ComponentNamespace is the namespace of the component that will consume a client configuration.", + "region": { + "description": "region holds the default AWS region for new AWS resources created by the cluster.", "type": "string", "default": "" }, - "conditions": { - "description": "Conditions are used to communicate the state of the `oidcClients` entry.\n\nSupported conditions include Available, Degraded and Progressing.\n\nIf Available is true, the component is successfully using the configured client. If Degraded is true, that means something has gone wrong trying to handle the client configuration. If Progressing is true, that means the component is taking some action related to the `oidcClients` entry.", + "resourceTags": { + "description": "resourceTags is a list of additional tags to apply to AWS resources created for the cluster. See https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html for information on tagging AWS resources. AWS supports a maximum of 50 tags per resource. OpenShift reserves 25 tags for its use, leaving 25 tags available for the user.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "consumingUsers": { - "description": "ConsumingUsers is a slice of ServiceAccounts that need to have read permission on the `clientSecret` secret.", - "type": "array", - "items": { - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.config.v1.AWSResourceTag" }, - "x-kubernetes-list-type": "set" + "x-kubernetes-list-type": "atomic" }, - "currentOIDCClients": { - "description": "CurrentOIDCClients is a list of clients that the component is currently using.", + "serviceEndpoints": { + "description": "ServiceEndpoints list contains custom endpoints which will override default service endpoint of AWS Services. There must be only one ServiceEndpoint for a service.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OIDCClientReference" + "$ref": "#/definitions/io.openshift.config.v1.AWSServiceEndpoint" }, - "x-kubernetes-list-map-keys": [ - "issuerURL", - "clientID" - ], - "x-kubernetes-list-type": "map" + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OIDCClientStatus", + "Kind": "AWSPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OIDCProvider": { + "io.openshift.config.v1.AWSResourceTag": { + "description": "AWSResourceTag is a tag to apply to AWS resources created for the cluster.", "type": "object", "required": [ - "name", - "issuer", - "oidcClients", - "claimMappings" + "key", + "value" ], "properties": { - "claimMappings": { - "description": "ClaimMappings describes rules on how to transform information from an ID token into a cluster identity", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TokenClaimMappings" - }, - "claimValidationRules": { - "description": "ClaimValidationRules are rules that are applied to validate token claims to authenticate users.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TokenClaimValidationRule" - }, - "x-kubernetes-list-type": "atomic" - }, - "issuer": { - "description": "Issuer describes atributes of the OIDC token issuer", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TokenIssuer" - }, - "name": { - "description": "Name of the OIDC provider", + "key": { + "description": "key is the key of the tag", "type": "string", "default": "" }, - "oidcClients": { - "description": "OIDCClients contains configuration for the platform's clients that need to request tokens from the issuer", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OIDCClientConfig" - }, - "x-kubernetes-list-map-keys": [ - "componentNamespace", - "componentName" - ], - "x-kubernetes-list-type": "map" + "value": { + "description": "value is the value of the tag. Some AWS service do not support empty values. Since tags are added to resources in many services, the length of the tag value must meet the requirements of all services.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OIDCProvider", + "Kind": "AWSResourceTag", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ObjectReference": { - "description": "ObjectReference contains enough information to let you inspect or modify the referred object.", + "io.openshift.config.v1.AWSServiceEndpoint": { + "description": "AWSServiceEndpoint store the configuration of a custom url to override existing defaults of AWS Services.", "type": "object", "required": [ - "group", - "resource", - "name" + "name", + "url" ], "properties": { - "group": { - "description": "group of the referent.", - "type": "string", - "default": "" - }, "name": { - "description": "name of the referent.", + "description": "name is the name of the AWS service. The list of all the service names can be found at https://docs.aws.amazon.com/general/latest/gr/aws-service-information.html This must be provided and cannot be empty.", "type": "string", "default": "" }, - "namespace": { - "description": "namespace of the referent.", - "type": "string" - }, - "resource": { - "description": "resource of the referent.", + "url": { + "description": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", "type": "string", "default": "" } @@ -22934,294 +23606,283 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "ObjectReference", + "Kind": "AWSServiceEndpoint", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OldTLSProfile": { - "description": "OldTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility", - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "OldTLSProfile", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.OpenIDClaims": { - "description": "OpenIDClaims contains a list of OpenID claims to use when authenticating with an OpenID identity provider", + "io.openshift.config.v1.AdmissionConfig": { "type": "object", "properties": { - "email": { - "description": "email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "groups": { - "description": "groups is the list of claims value of which should be used to synchronize groups from the OIDC provider to OpenShift for the user. If multiple claims are specified, the first one with a non-empty value is used.", + "disabledPlugins": { + "description": "disabledPlugins is a list of admission plugins that must be off. Putting something in this list is almost always a mistake and likely to result in cluster instability.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "name": { - "description": "name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", + "enabledPlugins": { + "description": "enabledPlugins is a list of admission plugins that must be on in addition to the default list. Some admission plugins are disabled by default, but certain configurations require them. This is fairly uncommon and can result in performance penalties and unexpected behavior.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } }, - "preferredUsername": { - "description": "preferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the sub claim", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "pluginConfig": { + "type": "object", + "additionalProperties": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AdmissionPluginConfig" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OpenIDClaims", + "Kind": "AdmissionConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OpenIDIdentityProvider": { - "description": "OpenIDIdentityProvider provides identities for users authenticating using OpenID credentials", + "io.openshift.config.v1.AdmissionPluginConfig": { + "description": "AdmissionPluginConfig holds the necessary configuration options for admission plugins", "type": "object", "required": [ - "clientID", - "clientSecret", - "issuer", - "claims" + "location", + "configuration" ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "claims": { - "description": "claims mappings", + "configuration": { + "description": "Configuration is an embedded configuration object to be used as the plugin's configuration. If present, it will be used instead of the path to the configuration file.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OpenIDClaims" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "clientID": { - "description": "clientID is the oauth client ID", + "location": { + "description": "Location is the path to a configuration file that contains the plugin's configuration", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "AdmissionPluginConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.AlibabaCloudPlatformSpec": { + "description": "AlibabaCloudPlatformSpec holds the desired state of the Alibaba Cloud infrastructure provider. This only includes fields that can be modified in the cluster.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "AlibabaCloudPlatformSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.AlibabaCloudPlatformStatus": { + "description": "AlibabaCloudPlatformStatus holds the current status of the Alibaba Cloud infrastructure provider.", + "type": "object", + "required": [ + "region" + ], + "properties": { + "region": { + "description": "region specifies the region for Alibaba Cloud resources created for the cluster.", "type": "string", "default": "" }, - "clientSecret": { - "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "extraAuthorizeParameters": { - "description": "extraAuthorizeParameters are any custom parameters to add to the authorize request.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "resourceGroupID": { + "description": "resourceGroupID is the ID of the resource group for the cluster.", + "type": "string" }, - "extraScopes": { - "description": "extraScopes are any scopes to request in addition to the standard \"openid\" scope.", + "resourceTags": { + "description": "resourceTags is a list of additional tags to apply to Alibaba Cloud resources created for the cluster.", "type": "array", "items": { - "type": "string", - "default": "" - } - }, - "issuer": { - "description": "issuer is the URL that the OpenID Provider asserts as its Issuer Identifier. It must use the https scheme with no query or fragment component.", - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AlibabaCloudResourceTag" + }, + "x-kubernetes-list-map-keys": [ + "key" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OpenIDIdentityProvider", + "Kind": "AlibabaCloudPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OpenStackPlatformLoadBalancer": { - "description": "OpenStackPlatformLoadBalancer defines the load balancer used by the cluster on OpenStack platform.", + "io.openshift.config.v1.AlibabaCloudResourceTag": { + "description": "AlibabaCloudResourceTag is the set of tags to add to apply to resources.", "type": "object", + "required": [ + "key", + "value" + ], "properties": { - "type": { - "description": "type defines the type of load balancer used by the cluster on OpenStack platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", + "key": { + "description": "key is the key of the tag.", "type": "string", - "default": "OpenShiftManagedDefault" + "default": "" + }, + "value": { + "description": "value is the value of the tag.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OpenStackPlatformLoadBalancer", + "Kind": "AlibabaCloudResourceTag", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": {} - } - ] + } }, - "io.openshift.config.v1.OpenStackPlatformSpec": { - "description": "OpenStackPlatformSpec holds the desired state of the OpenStack infrastructure provider. This only includes fields that can be modified in the cluster.", + "io.openshift.config.v1.Audit": { "type": "object", "properties": { - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.apiServerInternalIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.ingressIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", + "customRules": { + "description": "customRules specify profiles per group. These profile take precedence over the top-level profile field if they apply. They are evaluation from top to bottom and the first one that matches, applies.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AuditCustomRule" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group" + ], + "x-kubernetes-list-type": "map" }, - "machineNetworks": { - "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6, for example \"10.0.0.0/8\" or \"fd00::/8\".", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "profile": { + "description": "profile specifies the name of the desired top-level audit profile to be applied to all requests sent to any of the OpenShift-provided API servers in the cluster (kube-apiserver, openshift-apiserver and oauth-apiserver), with the exception of those requests that match one or more of the customRules.\n\nThe following profiles are provided: - Default: default policy which means MetaData level logging with the exception of events\n (not logged at all), oauthaccesstokens and oauthauthorizetokens (both logged at RequestBody\n level).\n- WriteRequestBodies: like 'Default', but logs request and response HTTP payloads for write requests (create, update, patch). - AllRequestBodies: like 'WriteRequestBodies', but also logs request and response HTTP payloads for read requests (get, list). - None: no requests are logged at all, not even oauthaccesstokens and oauthauthorizetokens.\n\nWarning: It is not recommended to disable audit logging by using the `None` profile unless you are fully aware of the risks of not logging data that can be beneficial when troubleshooting issues. If you disable audit logging and a support situation arises, you might need to enable audit logging and reproduce the issue in order to troubleshoot properly.\n\nIf unset, the 'Default' profile is used as the default.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OpenStackPlatformSpec", + "Kind": "Audit", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OpenStackPlatformStatus": { - "description": "OpenStackPlatformStatus holds the current status of the OpenStack infrastructure provider.", + "io.openshift.config.v1.AuditConfig": { + "description": "AuditConfig holds configuration for the audit capabilities", "type": "object", "required": [ - "apiServerInternalIPs", - "ingressIPs" + "enabled", + "auditFilePath", + "maximumFileRetentionDays", + "maximumRetainedFiles", + "maximumFileSizeMegabytes", + "policyFile", + "policyConfiguration", + "logFormat", + "webHookKubeConfig", + "webHookMode" ], "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", - "type": "string" + "auditFilePath": { + "description": "All requests coming to the apiserver will be logged to this file.", + "type": "string", + "default": "" }, - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "enabled": { + "description": "If this flag is set, audit log will be printed in the logs. The logs contains, method, user and a requested URL.", + "type": "boolean", + "default": false }, - "cloudName": { - "description": "cloudName is the name of the desired OpenStack cloud in the client configuration file (`clouds.yaml`).", - "type": "string" + "logFormat": { + "description": "Format of saved audits (legacy or json).", + "type": "string", + "default": "" }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", - "type": "string" + "maximumFileRetentionDays": { + "description": "Maximum number of days to retain old log files based on the timestamp encoded in their filename.", + "type": "integer", + "format": "int32", + "default": 0 }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "maximumFileSizeMegabytes": { + "description": "Maximum size in megabytes of the log file before it gets rotated. Defaults to 100MB.", + "type": "integer", + "format": "int32", + "default": 0 }, - "loadBalancer": { - "description": "loadBalancer defines how the load balancer used by the cluster is configured.", - "default": { - "type": "OpenShiftManagedDefault" - }, - "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformLoadBalancer" + "maximumRetainedFiles": { + "description": "Maximum number of old log files to retain.", + "type": "integer", + "format": "int32", + "default": 0 }, - "machineNetworks": { - "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "policyConfiguration": { + "description": "PolicyConfiguration is an embedded policy configuration object to be used as the audit policy configuration. If present, it will be used instead of the path to the policy file.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "nodeDNSIP": { - "description": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for OpenStack deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", - "type": "string" + "policyFile": { + "description": "PolicyFile is a path to the file that defines the audit policy configuration.", + "type": "string", + "default": "" + }, + "webHookKubeConfig": { + "description": "Path to a .kubeconfig formatted file that defines the audit webhook configuration.", + "type": "string", + "default": "" + }, + "webHookMode": { + "description": "Strategy for sending audit events (block or batch).", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OpenStackPlatformStatus", + "Kind": "AuditConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OperandVersion": { + "io.openshift.config.v1.AuditCustomRule": { + "description": "AuditCustomRule describes a custom rule for an audit profile that takes precedence over the top-level profile.", "type": "object", "required": [ - "name", - "version" + "group" ], "properties": { - "name": { - "description": "name is the name of the particular operand this version is for. It usually matches container images, not operators.", + "group": { + "description": "group is a name of group a request user must be member of in order to this profile to apply.", "type": "string", "default": "" }, - "version": { - "description": "version indicates which version of a particular operand is currently being managed. It must always match the Available operand. If 1.0.0 is Available, then this must indicate 1.0.0 even if the operator is trying to rollout 1.1.0", - "type": "string", - "default": "" + "profile": { + "description": "profile specifies the name of the desired audit policy configuration to be deployed to all OpenShift-provided API servers in the cluster.\n\nThe following profiles are provided: - Default: the existing default policy. - WriteRequestBodies: like 'Default', but logs request and response HTTP payloads for write requests (create, update, patch). - AllRequestBodies: like 'WriteRequestBodies', but also logs request and response HTTP payloads for read requests (get, list). - None: no requests are logged at all, not even oauthaccesstokens and oauthauthorizetokens.\n\nIf unset, the 'Default' profile is used as the default.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OperandVersion", + "Kind": "AuditCustomRule", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OperatorHub": { - "description": "OperatorHub is the Schema for the operatorhubs API. It can be used to change the state of the default hub sources for OperatorHub on the cluster from enabled to disabled and vice versa.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.Authentication": { + "description": "Authentication specifies cluster-wide settings for authentication (like OAuth and webhook token authenticators). The canonical name of an instance is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", - "spec", - "status" + "spec" ], "properties": { "apiVersion": { @@ -23238,24 +23899,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OperatorHubSpec" + "$ref": "#/definitions/io.openshift.config.v1.AuthenticationSpec" }, "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OperatorHubStatus" + "$ref": "#/definitions/io.openshift.config.v1.AuthenticationStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OperatorHub", + "Kind": "Authentication", "Scope": "Clustered" } }, - "io.openshift.config.v1.OperatorHubList": { - "description": "OperatorHubList contains a list of OperatorHub\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.AuthenticationList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -23270,7 +23933,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.OperatorHub" + "$ref": "#/definitions/io.openshift.config.v1.Authentication" } }, "kind": { @@ -23287,435 +23950,327 @@ "Type": "list", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OperatorHubList", + "Kind": "AuthenticationList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OperatorHubSpec": { - "description": "OperatorHubSpec defines the desired state of OperatorHub", + "io.openshift.config.v1.AuthenticationSpec": { "type": "object", "properties": { - "disableAllDefaultSources": { - "description": "disableAllDefaultSources allows you to disable all the default hub sources. If this is true, a specific entry in sources can be used to enable a default source. If this is false, a specific entry in sources can be used to disable or enable a default source.", - "type": "boolean" + "oauthMetadata": { + "description": "oauthMetadata contains the discovery endpoint data for OAuth 2.0 Authorization Server Metadata for an external OAuth server. This discovery document can be viewed from its served location: oc get --raw '/.well-known/oauth-authorization-server' For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 If oauthMetadata.name is non-empty, this value has precedence over any metadata reference stored in status. The key \"oauthMetadata\" is used to locate the data. If specified and the config map or expected key is not found, no metadata is served. If the specified metadata is not valid, no metadata is served. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "sources": { - "description": "sources is the list of default hub sources and their configuration. If the list is empty, it implies that the default hub sources are enabled on the cluster unless disableAllDefaultSources is true. If disableAllDefaultSources is true and sources is not empty, the configuration present in sources will take precedence. The list of default hub sources and their current state will always be reflected in the status block.", + "oidcProviders": { + "description": "OIDCProviders are OIDC identity providers that can issue tokens for this cluster Can only be set if \"Type\" is set to \"OIDC\".\n\nAt most one provider can be configured.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HubSource" - } + "$ref": "#/definitions/io.openshift.config.v1.OIDCProvider" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + }, + "serviceAccountIssuer": { + "description": "serviceAccountIssuer is the identifier of the bound service account token issuer. The default is https://kubernetes.default.svc WARNING: Updating this field will not result in immediate invalidation of all bound tokens with the previous issuer value. Instead, the tokens issued by previous service account issuer will continue to be trusted for a time period chosen by the platform (currently set to 24h). This time period is subject to change over time. This allows internal components to transition to use new service account issuer without service distruption.", + "type": "string", + "default": "" + }, + "type": { + "description": "type identifies the cluster managed, user facing authentication mode in use. Specifically, it manages the component that responds to login attempts. The default is IntegratedOAuth.", + "type": "string", + "default": "" + }, + "webhookTokenAuthenticator": { + "description": "webhookTokenAuthenticator configures a remote token reviewer. These remote authentication webhooks can be used to verify bearer tokens via the tokenreviews.authentication.k8s.io REST API. This is required to honor bearer tokens that are provisioned by an external authentication service.\n\nCan only be set if \"Type\" is set to \"None\".", + "$ref": "#/definitions/io.openshift.config.v1.WebhookTokenAuthenticator" + }, + "webhookTokenAuthenticators": { + "description": "webhookTokenAuthenticators is DEPRECATED, setting it has no effect.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DeprecatedWebhookTokenAuthenticator" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OperatorHubSpec", + "Kind": "AuthenticationSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OperatorHubStatus": { - "description": "OperatorHubStatus defines the observed state of OperatorHub. The current state of the default hub sources will always be reflected here.", + "io.openshift.config.v1.AuthenticationStatus": { "type": "object", + "required": [ + "integratedOAuthMetadata", + "oidcClients" + ], "properties": { - "sources": { - "description": "sources encapsulates the result of applying the configuration for each hub source", + "integratedOAuthMetadata": { + "description": "integratedOAuthMetadata contains the discovery endpoint data for OAuth 2.0 Authorization Server Metadata for the in-cluster integrated OAuth server. This discovery document can be viewed from its served location: oc get --raw '/.well-known/oauth-authorization-server' For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 This contains the observed value based on cluster state. An explicitly set value in spec.oauthMetadata has precedence over this field. This field has no meaning if authentication spec.type is not set to IntegratedOAuth. The key \"oauthMetadata\" is used to locate the data. If the config map or expected key is not found, no metadata is served. If the specified metadata is not valid, no metadata is served. The namespace for this config map is openshift-config-managed.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "oidcClients": { + "description": "OIDCClients is where participating operators place the current OIDC client status for OIDC clients that can be customized by the cluster-admin.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HubSourceStatus" - } + "$ref": "#/definitions/io.openshift.config.v1.OIDCClientStatus" + }, + "x-kubernetes-list-map-keys": [ + "componentNamespace", + "componentName" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OperatorHubStatus", + "Kind": "AuthenticationStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OvirtPlatformLoadBalancer": { - "description": "OvirtPlatformLoadBalancer defines the load balancer used by the cluster on Ovirt platform.", - "type": "object", - "properties": { - "type": { - "description": "type defines the type of load balancer used by the cluster on Ovirt platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", - "type": "string", - "default": "OpenShiftManagedDefault" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "OvirtPlatformLoadBalancer", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": {} - } - ] - }, - "io.openshift.config.v1.OvirtPlatformSpec": { - "description": "OvirtPlatformSpec holds the desired state of the oVirt infrastructure provider. This only includes fields that can be modified in the cluster.", + "io.openshift.config.v1.AzurePlatformSpec": { + "description": "AzurePlatformSpec holds the desired state of the Azure infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OvirtPlatformSpec", + "Kind": "AzurePlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.OvirtPlatformStatus": { - "description": "OvirtPlatformStatus holds the current status of the oVirt infrastructure provider.", + "io.openshift.config.v1.AzurePlatformStatus": { + "description": "AzurePlatformStatus holds the current status of the Azure infrastructure provider.", "type": "object", "required": [ - "apiServerInternalIPs", - "ingressIPs" + "resourceGroupName" ], "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", + "armEndpoint": { + "description": "armEndpoint specifies a URL to use for resource management in non-soverign clouds such as Azure Stack.", "type": "string" }, - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "cloudName": { + "description": "cloudName is the name of the Azure cloud environment which can be used to configure the Azure SDK with the appropriate Azure API endpoints. If empty, the value is equal to `AzurePublicCloud`.", + "type": "string" }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", + "networkResourceGroupName": { + "description": "networkResourceGroupName is the Resource Group for network resources like the Virtual Network and Subnets used by the cluster. If empty, the value is same as ResourceGroupName.", "type": "string" }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "resourceGroupName": { + "description": "resourceGroupName is the Resource Group for new Azure resources created for the cluster.", + "type": "string", + "default": "" + }, + "resourceTags": { + "description": "resourceTags is a list of additional tags to apply to Azure resources created for the cluster. See https://docs.microsoft.com/en-us/rest/api/resources/tags for information on tagging Azure resources. Due to limitations on Automation, Content Delivery Network, DNS Azure resources, a maximum of 15 tags may be applied. OpenShift reserves 5 tags for internal use, allowing 10 tags for user configuration.", "type": "array", "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "loadBalancer": { - "description": "loadBalancer defines how the load balancer used by the cluster is configured.", - "default": { - "type": "OpenShiftManagedDefault" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AzureResourceTag" }, - "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformLoadBalancer" - }, - "nodeDNSIP": { - "description": "deprecated: as of 4.6, this field is no longer set or honored. It will be removed in a future release.", - "type": "string" + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "OvirtPlatformStatus", + "Kind": "AzurePlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.PlatformSpec": { - "description": "PlatformSpec holds the desired state specific to the underlying infrastructure provider of the current cluster. Since these are used at spec-level for the underlying cluster, it is supposed that only one of the spec structs is set.", + "io.openshift.config.v1.AzureResourceTag": { + "description": "AzureResourceTag is a tag to apply to Azure resources created for the cluster.", "type": "object", "required": [ - "type" + "key", + "value" ], "properties": { - "alibabaCloud": { - "description": "AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AlibabaCloudPlatformSpec" - }, - "aws": { - "description": "AWS contains settings specific to the Amazon Web Services infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AWSPlatformSpec" - }, - "azure": { - "description": "Azure contains settings specific to the Azure infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AzurePlatformSpec" - }, - "baremetal": { - "description": "BareMetal contains settings specific to the BareMetal platform.", - "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformSpec" - }, - "equinixMetal": { - "description": "EquinixMetal contains settings specific to the Equinix Metal infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.EquinixMetalPlatformSpec" - }, - "external": { - "description": "ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately.", - "$ref": "#/definitions/io.openshift.config.v1.ExternalPlatformSpec" - }, - "gcp": { - "description": "GCP contains settings specific to the Google Cloud Platform infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.GCPPlatformSpec" - }, - "ibmcloud": { - "description": "IBMCloud contains settings specific to the IBMCloud infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.IBMCloudPlatformSpec" - }, - "kubevirt": { - "description": "Kubevirt contains settings specific to the kubevirt infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.KubevirtPlatformSpec" - }, - "nutanix": { - "description": "Nutanix contains settings specific to the Nutanix infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformSpec" - }, - "openstack": { - "description": "OpenStack contains settings specific to the OpenStack infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformSpec" - }, - "ovirt": { - "description": "Ovirt contains settings specific to the oVirt infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformSpec" - }, - "powervs": { - "description": "PowerVS contains settings specific to the IBM Power Systems Virtual Servers infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.PowerVSPlatformSpec" - }, - "type": { - "description": "type is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", \"KubeVirt\", \"EquinixMetal\", \"PowerVS\", \"AlibabaCloud\", \"Nutanix\" and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.", + "key": { + "description": "key is the key part of the tag. A tag key can have a maximum of 128 characters and cannot be empty. Key must begin with a letter, end with a letter, number or underscore, and must contain only alphanumeric characters and the following special characters `_ . -`.", "type": "string", "default": "" }, - "vsphere": { - "description": "VSphere contains settings specific to the VSphere infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformSpec" + "value": { + "description": "value is the value part of the tag. A tag value can have a maximum of 256 characters and cannot be empty. Value must contain only alphanumeric characters and the following special characters `_ + , - . / : ; \u003c = \u003e ? @`.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "PlatformSpec", + "Kind": "AzureResourceTag", "Scope": "Namespaced" } }, - "io.openshift.config.v1.PlatformStatus": { - "description": "PlatformStatus holds the current status specific to the underlying infrastructure provider of the current cluster. Since these are used at status-level for the underlying cluster, it is supposed that only one of the status structs is set.", + "io.openshift.config.v1.BareMetalPlatformLoadBalancer": { + "description": "BareMetalPlatformLoadBalancer defines the load balancer used by the cluster on BareMetal platform.", "type": "object", - "required": [ - "type" - ], "properties": { - "alibabaCloud": { - "description": "AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AlibabaCloudPlatformStatus" - }, - "aws": { - "description": "AWS contains settings specific to the Amazon Web Services infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AWSPlatformStatus" - }, - "azure": { - "description": "Azure contains settings specific to the Azure infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.AzurePlatformStatus" - }, - "baremetal": { - "description": "BareMetal contains settings specific to the BareMetal platform.", - "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformStatus" - }, - "equinixMetal": { - "description": "EquinixMetal contains settings specific to the Equinix Metal infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.EquinixMetalPlatformStatus" - }, - "external": { - "description": "External contains settings specific to the generic External infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.ExternalPlatformStatus" - }, - "gcp": { - "description": "GCP contains settings specific to the Google Cloud Platform infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.GCPPlatformStatus" - }, - "ibmcloud": { - "description": "IBMCloud contains settings specific to the IBMCloud infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.IBMCloudPlatformStatus" - }, - "kubevirt": { - "description": "Kubevirt contains settings specific to the kubevirt infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.KubevirtPlatformStatus" - }, - "nutanix": { - "description": "Nutanix contains settings specific to the Nutanix infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformStatus" - }, - "openstack": { - "description": "OpenStack contains settings specific to the OpenStack infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformStatus" - }, - "ovirt": { - "description": "Ovirt contains settings specific to the oVirt infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformStatus" - }, - "powervs": { - "description": "PowerVS contains settings specific to the Power Systems Virtual Servers infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.PowerVSPlatformStatus" - }, "type": { - "description": "type is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", \"EquinixMetal\", \"PowerVS\", \"AlibabaCloud\", \"Nutanix\" and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.\n\nThis value will be synced with to the `status.platform` and `status.platformStatus.type`. Currently this value cannot be changed once set.", + "description": "type defines the type of load balancer used by the cluster on BareMetal platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", "type": "string", - "default": "" - }, - "vsphere": { - "description": "VSphere contains settings specific to the VSphere infrastructure provider.", - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformStatus" + "default": "OpenShiftManagedDefault" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "PlatformStatus", + "Kind": "BareMetalPlatformLoadBalancer", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": {} + } + ] }, - "io.openshift.config.v1.PowerVSPlatformSpec": { - "description": "PowerVSPlatformSpec holds the desired state of the IBM Power Systems Virtual Servers infrastructure provider. This only includes fields that can be modified in the cluster.", + "io.openshift.config.v1.BareMetalPlatformSpec": { + "description": "BareMetalPlatformSpec holds the desired state of the BareMetal infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", "properties": { - "serviceEndpoints": { - "description": "serviceEndpoints is a list of custom endpoints which will override the default service endpoints of a Power VS service.", + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.apiServerInternalIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.PowerVSServiceEndpoint" + "type": "string", + "default": "" }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "x-kubernetes-list-type": "atomic" + }, + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.ingressIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "machineNetworks": { + "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6, for example \"10.0.0.0/8\" or \"fd00::/8\".", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "PowerVSPlatformSpec", + "Kind": "BareMetalPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.PowerVSPlatformStatus": { - "description": "PowerVSPlatformStatus holds the current status of the IBM Power Systems Virtual Servers infrastrucutre provider.", + "io.openshift.config.v1.BareMetalPlatformStatus": { + "description": "BareMetalPlatformStatus holds the current status of the BareMetal infrastructure provider. For more information about the network architecture used with the BareMetal platform type, see: https://github.com/openshift/installer/blob/master/docs/design/baremetal/networking-infrastructure.md", "type": "object", "required": [ - "region", - "zone" + "apiServerInternalIPs", + "ingressIPs" ], "properties": { - "cisInstanceCRN": { - "description": "CISInstanceCRN is the CRN of the Cloud Internet Services instance managing the DNS zone for the cluster's base domain", + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", "type": "string" }, - "dnsInstanceCRN": { - "description": "DNSInstanceCRN is the CRN of the DNS Services instance managing the DNS zone for the cluster's base domain", + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "type": "string" }, - "region": { - "description": "region holds the default Power VS region for new Power VS resources created by the cluster.", - "type": "string", - "default": "" + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "resourceGroup": { - "description": "resourceGroup is the resource group name for new IBMCloud resources created for a cluster. The resource group specified here will be used by cluster-image-registry-operator to set up a COS Instance in IBMCloud for the cluster registry. More about resource groups can be found here: https://cloud.ibm.com/docs/account?topic=account-rgs. When omitted, the image registry operator won't be able to configure storage, which results in the image registry cluster operator not being in an available state.", - "type": "string", - "default": "" + "loadBalancer": { + "description": "loadBalancer defines how the load balancer used by the cluster is configured.", + "default": { + "type": "OpenShiftManagedDefault" + }, + "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformLoadBalancer" }, - "serviceEndpoints": { - "description": "serviceEndpoints is a list of custom endpoints which will override the default service endpoints of a Power VS service.", + "machineNetworks": { + "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.PowerVSServiceEndpoint" + "type": "string", + "default": "" }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "x-kubernetes-list-type": "atomic" }, - "zone": { - "description": "zone holds the default zone for the new Power VS resources created by the cluster. Note: Currently only single-zone OCP clusters are supported", - "type": "string", - "default": "" + "nodeDNSIP": { + "description": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for BareMetal deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "PowerVSPlatformStatus", + "Kind": "BareMetalPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.PowerVSServiceEndpoint": { - "description": "PowervsServiceEndpoint stores the configuration of a custom url to override existing defaults of PowerVS Services.", + "io.openshift.config.v1.BasicAuthIdentityProvider": { + "description": "BasicAuthPasswordIdentityProvider provides identities for users authenticating using HTTP basic auth credentials", "type": "object", "required": [ - "name", "url" ], "properties": { - "name": { - "description": "name is the name of the Power VS service. Few of the services are IAM - https://cloud.ibm.com/apidocs/iam-identity-token-api ResourceController - https://cloud.ibm.com/apidocs/resource-controller/resource-controller Power Cloud - https://cloud.ibm.com/apidocs/power-cloud", - "type": "string", - "default": "" + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "url": { - "description": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "PowerVSServiceEndpoint", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.PrefixedClaimMapping": { - "type": "object", - "required": [ - "claim", - "prefix" - ], - "properties": { - "claim": { - "description": "Claim is a JWT token claim to be used in the mapping", - "type": "string", - "default": "" + "tlsClientCert": { + "description": "tlsClientCert is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate to present when connecting to the server. The key \"tls.crt\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "prefix": { - "description": "Prefix is a string to prefix the value from the token in the result of the claim mapping.\n\nBy default, no prefixing occurs.\n\nExample: if `prefix` is set to \"myoidc:\"\" and the `claim` in JWT contains an array of strings \"a\", \"b\" and \"c\", the mapping will result in an array of string \"myoidc:a\", \"myoidc:b\" and \"myoidc:c\".", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "PrefixedClaimMapping", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.ProfileCustomizations": { - "description": "ProfileCustomizations contains various parameters for modifying the default behavior of certain profiles", - "type": "object", - "properties": { - "dynamicResourceAllocation": { - "description": "dynamicResourceAllocation allows to enable or disable dynamic resource allocation within the scheduler. Dynamic resource allocation is an API for requesting and sharing resources between pods and containers inside a pod. Third-party resource drivers are responsible for tracking and allocating resources. Different kinds of resources support arbitrary parameters for defining requirements and initialization. Valid values are Enabled, Disabled and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is Disabled.", + "tlsClientKey": { + "description": "tlsClientKey is an optional reference to a secret by name that contains the PEM-encoded TLS private key for the client certificate referenced in tlsClientCert. The key \"tls.key\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "url": { + "description": "url is the remote URL to connect to", "type": "string", "default": "" } @@ -23724,12 +24279,12 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "ProfileCustomizations", + "Kind": "BasicAuthIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Project": { - "description": "Project holds cluster-wide information about Project. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.Build": { + "description": "Build configures the behavior of OpenShift builds for the entire cluster. This includes default settings that can be overridden in BuildConfig objects, and overrides which are applied to all builds.\n\nThe canonical name is \"cluster\"\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -23749,25 +24304,61 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ProjectSpec" - }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "description": "Spec holds user-settable values for the build controller configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ProjectStatus" + "$ref": "#/definitions/io.openshift.config.v1.BuildSpec" } }, "x-fabric8-info": { "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "Project", + "Kind": "Build", "Scope": "Clustered" } }, - "io.openshift.config.v1.ProjectList": { + "io.openshift.config.v1.BuildDefaults": { + "type": "object", + "properties": { + "defaultProxy": { + "description": "DefaultProxy contains the default proxy settings for all build operations, including image pull/push and source download.\n\nValues can be overrode by setting the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` environment variables in the build config's strategy.", + "$ref": "#/definitions/io.openshift.config.v1.ProxySpec" + }, + "env": { + "description": "Env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar" + } + }, + "gitProxy": { + "description": "GitProxy contains the proxy settings for git operations only. If set, this will override any Proxy settings for all git commands, such as git clone.\n\nValues that are not set here will be inherited from DefaultProxy.", + "$ref": "#/definitions/io.openshift.config.v1.ProxySpec" + }, + "imageLabels": { + "description": "ImageLabels is a list of docker labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageLabel" + } + }, + "resources": { + "description": "Resources defines resource requirements to execute the build.", + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "BuildDefaults", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.BuildList": { "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ @@ -23783,7 +24374,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Project" + "$ref": "#/definitions/io.openshift.config.v1.Build" } }, "kind": { @@ -23800,52 +24391,92 @@ "Type": "list", "Group": "config.openshift.io", "Version": "v1", - "Kind": "ProjectList", + "Kind": "BuildList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ProjectSpec": { - "description": "ProjectSpec holds the project creation configuration.", + "io.openshift.config.v1.BuildOverrides": { "type": "object", "properties": { - "projectRequestMessage": { - "description": "projectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint", - "type": "string", - "default": "" + "forcePull": { + "description": "ForcePull overrides, if set, the equivalent value in the builds, i.e. false disables force pull for all builds, true enables force pull for all builds, independently of what each build specifies itself", + "type": "boolean" }, - "projectRequestTemplate": { - "description": "projectRequestTemplate is the template to use for creating projects in response to projectrequest. This must point to a template in 'openshift-config' namespace. It is optional. If it is not specified, a default template is used.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TemplateReference" + "imageLabels": { + "description": "ImageLabels is a list of docker labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageLabel" + } + }, + "nodeSelector": { + "description": "NodeSelector is a selector which must be true for the build pod to fit on a node", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "tolerations": { + "description": "Tolerations is a list of Tolerations that will override any existing tolerations set on a build pod.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "ProjectSpec", + "Kind": "BuildOverrides", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ProjectStatus": { + "io.openshift.config.v1.BuildSpec": { "type": "object", + "properties": { + "additionalTrustedCA": { + "description": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during builds. The namespace for this config map is openshift-config.\n\nDEPRECATED: Additional CAs for image pull and push should be set on image.config.openshift.io/cluster instead.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "buildDefaults": { + "description": "BuildDefaults controls the default information for Builds", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.BuildDefaults" + }, + "buildOverrides": { + "description": "BuildOverrides controls override settings for builds", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.BuildOverrides" + } + }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "ProjectStatus", + "Kind": "BuildSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.PromQLClusterCondition": { - "description": "PromQLClusterCondition represents a cluster condition based on PromQL.", + "io.openshift.config.v1.CertInfo": { + "description": "CertInfo relates a certificate with a private key", "type": "object", "required": [ - "promql" + "certFile", + "keyFile" ], "properties": { - "promql": { - "description": "PromQL is a PromQL query classifying clusters. This query query should return a 1 in the match case and a 0 in the does-not-match case. Queries which return no time series, or which return values besides 0 or 1, are evaluation failures.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" } @@ -23854,196 +24485,113 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "PromQLClusterCondition", + "Kind": "CertInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Proxy": { - "description": "Proxy holds cluster-wide information on how to configure default proxies for the cluster. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ClientConnectionOverrides": { "type": "object", "required": [ - "spec" + "acceptContentTypes", + "contentType", + "qps", + "burst" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "acceptContentTypes": { + "description": "acceptContentTypes defines the Accept header sent by clients when connecting to a server, overriding the default value of 'application/json'. This field will control all connections to the server used by a particular client.", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "burst": { + "description": "burst allows extra queries to accumulate when a client is exceeding its rate.", + "type": "integer", + "format": "int32", + "default": 0 }, - "spec": { - "description": "Spec holds user-settable values for the proxy configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ProxySpec" + "contentType": { + "description": "contentType is the content type used when sending data to the server from this client.", + "type": "string", + "default": "" }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ProxyStatus" + "qps": { + "description": "qps controls the number of queries per second allowed for this connection.", + "type": "number", + "format": "float", + "default": 0 } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "Proxy", - "Scope": "Clustered" - } - }, - "io.openshift.config.v1.ProxyList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Proxy" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ProxyList", + "Kind": "ClientConnectionOverrides", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ProxySpec": { - "description": "ProxySpec contains cluster proxy creation configuration.", + "io.openshift.config.v1.CloudControllerManagerStatus": { + "description": "CloudControllerManagerStatus holds the state of Cloud Controller Manager (a.k.a. CCM or CPI) related settings", "type": "object", "properties": { - "httpProxy": { - "description": "httpProxy is the URL of the proxy for HTTP requests. Empty means unset and will not result in an env var.", - "type": "string" - }, - "httpsProxy": { - "description": "httpsProxy is the URL of the proxy for HTTPS requests. Empty means unset and will not result in an env var.", - "type": "string" - }, - "noProxy": { - "description": "noProxy is a comma-separated list of hostnames and/or CIDRs and/or IPs for which the proxy should not be used. Empty means unset and will not result in an env var.", - "type": "string" - }, - "readinessEndpoints": { - "description": "readinessEndpoints is a list of endpoints used to verify readiness of the proxy.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "trustedCA": { - "description": "trustedCA is a reference to a ConfigMap containing a CA certificate bundle. The trustedCA field should only be consumed by a proxy validator. The validator is responsible for reading the certificate bundle from the required key \"ca-bundle.crt\", merging it with the system default trust bundle, and writing the merged trust bundle to a ConfigMap named \"trusted-ca-bundle\" in the \"openshift-config-managed\" namespace. Clients that expect to make proxy connections must use the trusted-ca-bundle for all HTTPS requests to the proxy, and may use the trusted-ca-bundle for non-proxy HTTPS requests as well.\n\nThe namespace for the ConfigMap referenced by trustedCA is \"openshift-config\". Here is an example ConfigMap (in yaml):\n\napiVersion: v1 kind: ConfigMap metadata:\n name: user-ca-bundle\n namespace: openshift-config\n data:\n ca-bundle.crt: |\n -----BEGIN CERTIFICATE-----\n Custom CA certificate bundle.\n -----END CERTIFICATE-----", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "state": { + "description": "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager\n\nValid values are \"External\", \"None\" and omitted. When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "ProxySpec", + "Kind": "CloudControllerManagerStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ProxyStatus": { - "description": "ProxyStatus shows current known state of the cluster proxy.", + "io.openshift.config.v1.CloudLoadBalancerConfig": { + "description": "CloudLoadBalancerConfig contains an union discriminator indicating the type of DNS solution in use within the cluster. When the DNSType is `ClusterHosted`, the cloud's Load Balancer configuration needs to be provided so that the DNS solution hosted within the cluster can be configured with those values.", "type": "object", "properties": { - "httpProxy": { - "description": "httpProxy is the URL of the proxy for HTTP requests.", - "type": "string" - }, - "httpsProxy": { - "description": "httpsProxy is the URL of the proxy for HTTPS requests.", - "type": "string" + "clusterHosted": { + "description": "clusterHosted holds the IP addresses of API, API-Int and Ingress Load Balancers on Cloud Platforms. The DNS solution hosted within the cluster use these IP addresses to provide resolution for API, API-Int and Ingress services.", + "$ref": "#/definitions/io.openshift.config.v1.CloudLoadBalancerIPs" }, - "noProxy": { - "description": "noProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ProxyStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.RegistryLocation": { - "description": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.", - "type": "object", - "required": [ - "domainName" - ], - "properties": { - "domainName": { - "description": "domainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.", + "dnsType": { + "description": "dnsType indicates the type of DNS solution in use within the cluster. Its default value of `PlatformDefault` indicates that the cluster's DNS is the default provided by the cloud platform. It can be set to `ClusterHosted` to bypass the configuration of the cloud default DNS. In this mode, the cluster needs to provide a self-hosted DNS solution for the cluster's installation to succeed. The cluster's use of the cloud's Load Balancers is unaffected by this setting. The value is immutable after it has been set at install time. Currently, there is no way for the customer to add additional DNS entries into the cluster hosted DNS. Enabling this functionality allows the user to start their own DNS solution outside the cluster after installation is complete. The customer would be responsible for configuring this custom DNS solution, and it can be run in addition to the in-cluster DNS solution.", "type": "string", - "default": "" - }, - "insecure": { - "description": "insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.", - "type": "boolean" + "default": "PlatformDefault" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "RegistryLocation", + "Kind": "CloudLoadBalancerConfig", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "dnsType", + "fields-to-discriminateBy": { + "clusterHosted": "ClusterHosted" + } + } + ] }, - "io.openshift.config.v1.RegistrySources": { - "description": "RegistrySources holds cluster-wide information about how to handle the registries config.", + "io.openshift.config.v1.CloudLoadBalancerIPs": { + "description": "CloudLoadBalancerIPs contains the Load Balancer IPs for the cloud's API, API-Int and Ingress Load balancers. They will be populated as soon as the respective Load Balancers have been configured. These values are utilized to configure the DNS solution hosted within the cluster.", "type": "object", "properties": { - "allowedRegistries": { - "description": "allowedRegistries are the only registries permitted for image pull and push actions. All other registries are denied.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "blockedRegistries": { - "description": "blockedRegistries cannot be used for image pull and push actions. All other registries are permitted.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.", + "apiIntLoadBalancerIPs": { + "description": "apiIntLoadBalancerIPs holds Load Balancer IPs for the internal API service. These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses. Entries in the apiIntLoadBalancerIPs must be unique. A maximum of 16 IP addresses are permitted.", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "set" }, - "containerRuntimeSearchRegistries": { - "description": "containerRuntimeSearchRegistries are registries that will be searched when pulling images that do not have fully qualified domains in their pull specs. Registries will be searched in the order provided in the list. Note: this search list only works with the container runtime, i.e CRI-O. Will NOT work with builds or imagestream imports.", + "apiLoadBalancerIPs": { + "description": "apiLoadBalancerIPs holds Load Balancer IPs for the API service. These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses. Could be empty for private clusters. Entries in the apiLoadBalancerIPs must be unique. A maximum of 16 IP addresses are permitted.", "type": "array", "items": { "type": "string", @@ -24051,51 +24599,37 @@ }, "x-kubernetes-list-type": "set" }, - "insecureRegistries": { - "description": "insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.", + "ingressLoadBalancerIPs": { + "description": "ingressLoadBalancerIPs holds IPs for Ingress Load Balancers. These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses. Entries in the ingressLoadBalancerIPs must be unique. A maximum of 16 IP addresses are permitted.", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "set" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "RegistrySources", + "Kind": "CloudLoadBalancerIPs", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Release": { - "description": "Release represents an OpenShift release image and associated metadata.", + "io.openshift.config.v1.ClusterCondition": { + "description": "ClusterCondition is a union of typed cluster conditions. The 'type' property determines which of the type-specific properties are relevant. When evaluated on a cluster, the condition may match, not match, or fail to evaluate.", "type": "object", "required": [ - "version", - "image" + "type" ], "properties": { - "channels": { - "description": "channels is the set of Cincinnati channels to which the release currently belongs.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "image": { - "description": "image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.", - "type": "string", - "default": "" - }, - "url": { - "description": "url contains information about this release. This URL is set by the 'url' metadata property on a release or the metadata returned by the update API and should be displayed as a link in user interfaces. The URL field may not be set for test or nightly releases.", - "type": "string" + "promql": { + "description": "promQL represents a cluster condition based on PromQL.", + "$ref": "#/definitions/io.openshift.config.v1.PromQLClusterCondition" }, - "version": { - "description": "version is a semantic version identifying the update version. When this field is part of spec, version is optional if image is specified.", + "type": { + "description": "type represents the cluster-condition type. This defines the members and semantics of any additional properties.", "type": "string", "default": "" } @@ -24104,149 +24638,157 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "Release", + "Kind": "ClusterCondition", "Scope": "Namespaced" } }, - "io.openshift.config.v1.RemoteConnectionInfo": { - "description": "RemoteConnectionInfo holds information necessary for establishing a remote connection", + "io.openshift.config.v1.ClusterNetworkEntry": { + "description": "ClusterNetworkEntry is a contiguous block of IP addresses from which pod IPs are allocated.", "type": "object", "required": [ - "url", - "ca", - "certFile", - "keyFile" + "cidr" ], "properties": { - "ca": { - "description": "CA is the CA for verifying TLS connections", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "cidr": { + "description": "The complete block for pod IPs.", "type": "string", "default": "" }, - "url": { - "description": "URL is the remote URL to connect to", - "type": "string", - "default": "" + "hostPrefix": { + "description": "The size (prefix) of block to allocate to each node. If this field is not used by the plugin, it can be left unset.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "RemoteConnectionInfo", + "Kind": "ClusterNetworkEntry", "Scope": "Namespaced" } }, - "io.openshift.config.v1.RepositoryDigestMirrors": { - "description": "RepositoryDigestMirrors holds cluster-wide information about how to handle mirrors in the registries config.", + "io.openshift.config.v1.ClusterOperator": { + "description": "ClusterOperator is the Custom Resource object which holds the current state of an operator. This object is used by operators to convey their state to the rest of the cluster.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "source" + "metadata", + "spec" ], "properties": { - "allowMirrorByTags": { - "description": "allowMirrorByTags if true, the mirrors can be used to pull the images that are referenced by their tags. Default is false, the mirrors only work when pulling the images that are referenced by their digests. Pulling images by tag can potentially yield different images, depending on which endpoint we pull from. Forcing digest-pulls for mirrors avoids that issue.", - "type": "boolean" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "mirrors": { - "description": "mirrors is zero or more repositories that may also contain the same images. If the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec. No mirror will be configured. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. Other cluster configuration, including (but not limited to) other repositoryDigestMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "source": { - "description": "source is the repository that users refer to, e.g. in image pull specifications.", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds configuration that could apply to any operator.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorSpec" + }, + "status": { + "description": "status holds the information about the state of an operator. It is consistent with status information across the Kubernetes ecosystem.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorStatus" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "RepositoryDigestMirrors", - "Scope": "Namespaced" + "Kind": "ClusterOperator", + "Scope": "Clustered" } }, - "io.openshift.config.v1.RequestHeaderIdentityProvider": { - "description": "RequestHeaderIdentityProvider provides identities for users authenticating using request header credentials", + "io.openshift.config.v1.ClusterOperatorList": { + "description": "ClusterOperatorList is a list of OperatorStatus resources.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "loginURL", - "challengeURL", - "ca", - "headers", - "preferredUsernameHeaders", - "nameHeaders", - "emailHeaders" + "metadata", + "items" ], "properties": { - "ca": { - "description": "ca is a required reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. Specifically, it allows verification of incoming requests to prevent header spoofing. The key \"ca.crt\" is used to locate the data. If the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "challengeURL": { - "description": "challengeURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect WWW-Authenticate challenges will be redirected here. ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}\nRequired when challenge is set to true.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "clientCommonNames": { - "description": "clientCommonNames is an optional list of common names to require a match from. If empty, any client certificate validated against the clientCA bundle is considered authoritative.", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterOperator" } }, - "emailHeaders": { - "description": "emailHeaders is the set of headers to check for the email address", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "headers": { - "description": "headers is the set of headers to check for identity information", + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ClusterOperatorList", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ClusterOperatorSpec": { + "description": "ClusterOperatorSpec is empty for now, but you could imagine holding information like \"pause\".", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ClusterOperatorSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ClusterOperatorStatus": { + "description": "ClusterOperatorStatus provides information about the status of the operator.", + "type": "object", + "properties": { + "conditions": { + "description": "conditions describes the state of the operator's managed and monitored components.", "type": "array", "items": { - "type": "string", - "default": "" - } + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorStatusCondition" + }, + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" }, - "loginURL": { - "description": "loginURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect interactive logins will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}\nRequired when login is set to true.", - "type": "string", - "default": "" + "extension": { + "description": "extension contains any additional status information specific to the operator which owns this status object.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "nameHeaders": { - "description": "nameHeaders is the set of headers to check for the display name", + "relatedObjects": { + "description": "relatedObjects is a list of objects that are \"interesting\" or related to this operator. Common uses are: 1. the detailed resource driving the operator 2. operator namespaces 3. operand namespaces", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ObjectReference" } }, - "preferredUsernameHeaders": { - "description": "preferredUsernameHeaders is the set of headers to check for the preferred username", + "versions": { + "description": "versions is a slice of operator and operand version tuples. Operators which manage multiple operands will have multiple operand entries in the array. Available operators must report the version of the operator itself with the name \"operator\". An operator reports a new \"operator\" version when it has rolled out the new version to all of its operands.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.OperandVersion" } } }, @@ -24254,53 +24796,53 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "RequestHeaderIdentityProvider", + "Kind": "ClusterOperatorStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.RequiredHSTSPolicy": { + "io.openshift.config.v1.ClusterOperatorStatusCondition": { + "description": "ClusterOperatorStatusCondition represents the state of the operator's managed and monitored components.", "type": "object", "required": [ - "domainPatterns", - "maxAge" + "type", + "status", + "lastTransitionTime" ], "properties": { - "domainPatterns": { - "description": "domainPatterns is a list of domains for which the desired HSTS annotations are required. If domainPatterns is specified and a route is created with a spec.host matching one of the domains, the route must specify the HSTS Policy components described in the matching RequiredHSTSPolicy.\n\nThe use of wildcards is allowed like this: *.foo.com matches everything under foo.com. foo.com only matches foo.com, so to cover foo.com and everything under it, you must specify *both*.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "lastTransitionTime": { + "description": "lastTransitionTime is the time of the last update to the current status property.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "includeSubDomainsPolicy": { - "description": "includeSubDomainsPolicy means the HSTS Policy should apply to any subdomains of the host's domain name. Thus, for the host bar.foo.com, if includeSubDomainsPolicy was set to RequireIncludeSubDomains: - the host app.bar.foo.com would inherit the HSTS Policy of bar.foo.com - the host bar.foo.com would inherit the HSTS Policy of bar.foo.com - the host foo.com would NOT inherit the HSTS Policy of bar.foo.com - the host def.foo.com would NOT inherit the HSTS Policy of bar.foo.com", + "message": { + "description": "message provides additional information about the current condition. This is only to be consumed by humans. It may contain Line Feed characters (U+000A), which should be rendered as new lines.", "type": "string" }, - "maxAge": { - "description": "maxAge is the delta time range in seconds during which hosts are regarded as HSTS hosts. If set to 0, it negates the effect, and hosts are removed as HSTS hosts. If set to 0 and includeSubdomains is specified, all subdomains of the host are also removed as HSTS hosts. maxAge is a time-to-live value, and if this policy is not refreshed on a client, the HSTS policy will eventually expire on that client.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.MaxAgePolicy" + "reason": { + "description": "reason is the CamelCase reason for the condition's current status.", + "type": "string" }, - "namespaceSelector": { - "description": "namespaceSelector specifies a label selector such that the policy applies only to those routes that are in namespaces with labels that match the selector, and are in one of the DomainPatterns. Defaults to the empty LabelSelector, which matches everything.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + "status": { + "description": "status of the condition, one of True, False, Unknown.", + "type": "string", + "default": "" }, - "preloadPolicy": { - "description": "preloadPolicy directs the client to include hosts in its host preload list so that it never needs to do an initial load to get the HSTS header (note that this is not defined in RFC 6797 and is therefore client implementation-dependent).", - "type": "string" + "type": { + "description": "type specifies the aspect reported by this condition.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "RequiredHSTSPolicy", + "Kind": "ClusterOperatorStatusCondition", "Scope": "Namespaced" } }, - "io.openshift.config.v1.Scheduler": { - "description": "Scheduler holds cluster-wide config information to run the Kubernetes Scheduler and influence its placement decisions. The canonical name for this config is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ClusterVersion": { + "description": "ClusterVersion is the configuration for the ClusterVersionOperator. This is where parameters related to automatic updates can be set.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -24320,26 +24862,83 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec holds user settable values for configuration", + "description": "spec is the desired state of the cluster version - the operator will work to ensure that the desired version is applied to the cluster.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SchedulerSpec" + "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionSpec" }, "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "description": "status contains information about the available updates and any in-progress updates.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SchedulerStatus" + "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "Scheduler", + "Kind": "ClusterVersion", "Scope": "Clustered" } }, - "io.openshift.config.v1.SchedulerList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ClusterVersionCapabilitiesSpec": { + "description": "ClusterVersionCapabilitiesSpec selects the managed set of optional, core cluster components.", + "type": "object", + "properties": { + "additionalEnabledCapabilities": { + "description": "additionalEnabledCapabilities extends the set of managed capabilities beyond the baseline defined in baselineCapabilitySet. The default is an empty set.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "baselineCapabilitySet": { + "description": "baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities. If unset, the cluster will choose a default, and the default may change over time. The current default is vCurrent.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ClusterVersionCapabilitiesSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ClusterVersionCapabilitiesStatus": { + "description": "ClusterVersionCapabilitiesStatus describes the state of optional, core cluster components.", + "type": "object", + "properties": { + "enabledCapabilities": { + "description": "enabledCapabilities lists all the capabilities that are currently managed.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "knownCapabilities": { + "description": "knownCapabilities lists all the capabilities known to the current cluster.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ClusterVersionCapabilitiesStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ClusterVersionList": { + "description": "ClusterVersionList is a list of ClusterVersion resources.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -24354,7 +24953,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.Scheduler" + "$ref": "#/definitions/io.openshift.config.v1.ClusterVersion" } }, "kind": { @@ -24371,64 +24970,144 @@ "Type": "list", "Group": "config.openshift.io", "Version": "v1", - "Kind": "SchedulerList", + "Kind": "ClusterVersionList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.SchedulerSpec": { + "io.openshift.config.v1.ClusterVersionSpec": { + "description": "ClusterVersionSpec is the desired version state of the cluster. It includes the version the cluster should be at, how the cluster is identified, and where the cluster should look for version updates.", "type": "object", - "properties": { - "defaultNodeSelector": { - "description": "defaultNodeSelector helps set the cluster-wide default node selector to restrict pod placement to specific nodes. This is applied to the pods created in all namespaces and creates an intersection with any existing nodeSelectors already set on a pod, additionally constraining that pod's selector. For example, defaultNodeSelector: \"type=user-node,region=east\" would set nodeSelector field in pod spec to \"type=user-node,region=east\" to all pods created in all namespaces. Namespaces having project-wide node selectors won't be impacted even if this field is set. This adds an annotation section to the namespace. For example, if a new namespace is created with node-selector='type=user-node,region=east', the annotation openshift.io/node-selector: type=user-node,region=east gets added to the project. When the openshift.io/node-selector annotation is set on the project the value is used in preference to the value we are setting for defaultNodeSelector field. For instance, openshift.io/node-selector: \"type=user-node,region=west\" means that the default of \"type=user-node,region=east\" set in defaultNodeSelector would not be applied.", + "required": [ + "clusterID" + ], + "properties": { + "capabilities": { + "description": "capabilities configures the installation of optional, core cluster components. A null value here is identical to an empty object; see the child properties for default semantics.", + "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionCapabilitiesSpec" + }, + "channel": { + "description": "channel is an identifier for explicitly requesting that a non-default set of updates be applied to this cluster. The default channel will be contain stable updates that are appropriate for production clusters.", "type": "string" }, - "mastersSchedulable": { - "description": "MastersSchedulable allows masters nodes to be schedulable. When this flag is turned on, all the master nodes in the cluster will be made schedulable, so that workload pods can run on them. The default value for this field is false, meaning none of the master nodes are schedulable. Important Note: Once the workload pods start running on the master nodes, extreme care must be taken to ensure that cluster-critical control plane components are not impacted. Please turn on this field after doing due diligence.", - "type": "boolean", - "default": false + "clusterID": { + "description": "clusterID uniquely identifies this cluster. This is expected to be an RFC4122 UUID value (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx in hexadecimal values). This is a required field.", + "type": "string", + "default": "" }, - "policy": { - "description": "DEPRECATED: the scheduler Policy API has been deprecated and will be removed in a future release. policy is a reference to a ConfigMap containing scheduler policy which has user specified predicates and priorities. If this ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider. The namespace for this configmap is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "desiredUpdate": { + "description": "desiredUpdate is an optional field that indicates the desired value of the cluster version. Setting this value will trigger an upgrade (if the current version does not match the desired version). The set of recommended update values is listed as part of available updates in status, and setting values outside that range may cause the upgrade to fail.\n\nSome of the fields are inter-related with restrictions and meanings described here. 1. image is specified, version is specified, architecture is specified. API validation error. 2. image is specified, version is specified, architecture is not specified. You should not do this. version is silently ignored and image is used. 3. image is specified, version is not specified, architecture is specified. API validation error. 4. image is specified, version is not specified, architecture is not specified. image is used. 5. image is not specified, version is specified, architecture is specified. version and desired architecture are used to select an image. 6. image is not specified, version is specified, architecture is not specified. version and current architecture are used to select an image. 7. image is not specified, version is not specified, architecture is specified. API validation error. 8. image is not specified, version is not specified, architecture is not specified. API validation error.\n\nIf an upgrade fails the operator will halt and report status about the failing component. Setting the desired update value back to the previous version will cause a rollback to be attempted. Not all rollbacks will succeed.", + "$ref": "#/definitions/io.openshift.config.v1.Update" }, - "profile": { - "description": "profile sets which scheduling profile should be set in order to configure scheduling decisions for new pods.\n\nValid values are \"LowNodeUtilization\", \"HighNodeUtilization\", \"NoScoring\" Defaults to \"LowNodeUtilization\"", - "type": "string" + "overrides": { + "description": "overrides is list of overides for components that are managed by cluster version operator. Marking a component unmanaged will prevent the operator from creating or updating the object.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ComponentOverride" + }, + "x-kubernetes-list-map-keys": [ + "kind", + "group", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, - "profileCustomizations": { - "description": "profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ProfileCustomizations" + "signatureStores": { + "description": "signatureStores contains the upstream URIs to verify release signatures and optional reference to a config map by name containing the PEM-encoded CA bundle.\n\nBy default, CVO will use existing signature stores if this property is empty. The CVO will check the release signatures in the local ConfigMaps first. It will search for a valid signature in these stores in parallel only when local ConfigMaps did not include a valid signature. Validation will fail if none of the signature stores reply with valid signature before timeout. Setting signatureStores will replace the default signature stores with custom signature stores. Default stores can be used with custom signature stores by adding them manually.\n\nA maximum of 32 signature stores may be configured.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SignatureStore" + }, + "x-kubernetes-list-map-keys": [ + "url" + ], + "x-kubernetes-list-type": "map" + }, + "upstream": { + "description": "upstream may be used to specify the preferred update server. By default it will use the appropriate update server for the cluster and region.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "SchedulerSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.SchedulerStatus": { - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "SchedulerStatus", + "Kind": "ClusterVersionSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.SecretNameReference": { - "description": "SecretNameReference references a secret in a specific namespace. The namespace must be specified at the point of use.", + "io.openshift.config.v1.ClusterVersionStatus": { + "description": "ClusterVersionStatus reports the status of the cluster versioning, including any upgrades that are in progress. The current field will be set to whichever version the cluster is reconciling to, and the conditions array will report whether the update succeeded, is in progress, or is failing.", "type": "object", "required": [ - "name" + "desired", + "observedGeneration", + "versionHash", + "capabilities", + "availableUpdates" ], "properties": { - "name": { - "description": "name is the metadata.name of the referenced secret", + "availableUpdates": { + "description": "availableUpdates contains updates recommended for this cluster. Updates which appear in conditionalUpdates but not in availableUpdates may expose this cluster to known issues. This list may be empty if no updates are recommended, if the update service is unavailable, or if an invalid channel has been specified.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.Release" + }, + "x-kubernetes-list-type": "atomic" + }, + "capabilities": { + "description": "capabilities describes the state of optional, core cluster components.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterVersionCapabilitiesStatus" + }, + "conditionalUpdates": { + "description": "conditionalUpdates contains the list of updates that may be recommended for this cluster if it meets specific required conditions. Consumers interested in the set of updates that are actually recommended for this cluster should use availableUpdates. This list may be empty if no updates are recommended, if the update service is unavailable, or if an empty or invalid channel has been specified.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConditionalUpdate" + }, + "x-kubernetes-list-type": "atomic" + }, + "conditions": { + "description": "conditions provides information about the cluster version. The condition \"Available\" is set to true if the desiredUpdate has been reached. The condition \"Progressing\" is set to true if an update is being applied. The condition \"Degraded\" is set to true if an update is currently blocked by a temporary or permanent error. Conditions are only valid for the current desiredUpdate when metadata.generation is equal to status.generation.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterOperatorStatusCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "desired": { + "description": "desired is the version that the cluster is reconciling towards. If the cluster is not yet fully initialized desired will be set with the information available, which may be an image or a tag.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.Release" + }, + "history": { + "description": "history contains a list of the most recent versions applied to the cluster. This value may be empty during cluster startup, and then will be updated when a new update is being applied. The newest update is first in the list and it is ordered by recency. Updates in the history have state Completed if the rollout completed - if an update was failing or halfway applied the state will be Partial. Only a limited amount of update history is preserved.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.UpdateHistory" + }, + "x-kubernetes-list-type": "atomic" + }, + "observedGeneration": { + "description": "observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent a previous version.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "versionHash": { + "description": "versionHash is a fingerprint of the content that the cluster will be updated with. It is used by the operator to avoid unnecessary work and is for internal use only.", "type": "string", "default": "" } @@ -24437,230 +25116,244 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "SecretNameReference", + "Kind": "ClusterVersionStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.ServingInfo": { - "description": "ServingInfo holds information about serving web pages", + "io.openshift.config.v1.ComponentOverride": { + "description": "ComponentOverride allows overriding cluster version operator's behavior for a component.", "type": "object", "required": [ - "bindAddress", - "bindNetwork", - "certFile", - "keyFile" + "kind", + "group", + "namespace", + "name", + "unmanaged" ], "properties": { - "bindAddress": { - "description": "BindAddress is the ip:port to serve on", + "group": { + "description": "group identifies the API group that the kind is in.", "type": "string", "default": "" }, - "bindNetwork": { - "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", + "kind": { + "description": "kind indentifies which object to override.", "type": "string", "default": "" }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "name": { + "description": "name is the component's name.", "type": "string", "default": "" }, - "cipherSuites": { - "description": "CipherSuites contains an overridden list of ciphers for the server to support. Values must match cipher suite IDs from https://golang.org/pkg/crypto/tls/#pkg-constants", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "clientCA": { - "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", - "type": "string" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "namespace": { + "description": "namespace is the component's namespace. If the resource is cluster scoped, the namespace should be empty.", "type": "string", "default": "" }, - "minTLSVersion": { - "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", - "type": "string" - }, - "namedCertificates": { - "description": "NamedCertificates is a list of certificates to use to secure requests to specific hostnames", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.NamedCertificate" - } - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "ServingInfo", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.SignatureStore": { - "description": "SignatureStore represents the URL of custom Signature Store", - "type": "object", - "required": [ - "url" - ], - "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the signature store is not honored. If the specified ca data is not valid, the signature store is not honored. If empty, we fall back to the CA configured via Proxy, which is appended to the default system roots. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "url": { - "description": "url contains the upstream custom signature store URL. url should be a valid absolute http/https URI of an upstream signature store as per rfc1738. This must be provided and cannot be empty.", - "type": "string", - "default": "" + "unmanaged": { + "description": "unmanaged controls if cluster version operator should stop managing the resources in this cluster. Default: false", + "type": "boolean", + "default": false } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "SignatureStore", + "Kind": "ComponentOverride", "Scope": "Namespaced" } }, - "io.openshift.config.v1.StringSource": { - "description": "StringSource allows specifying a string inline, or externally via env var or file. When it contains only a string value, it marshals to a simple JSON string.", + "io.openshift.config.v1.ComponentRouteSpec": { + "description": "ComponentRouteSpec allows for configuration of a route's hostname and serving certificate.", "type": "object", "required": [ - "value", - "env", - "file", - "keyFile" + "namespace", + "name", + "hostname" ], "properties": { - "env": { - "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", + "hostname": { + "description": "hostname is the hostname that should be used by the route.", "type": "string", "default": "" }, - "file": { - "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", + "name": { + "description": "name is the logical name of the route to customize.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of status.componentRoutes if the route is to be customized.", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile references a file containing the key to use to decrypt the value.", + "namespace": { + "description": "namespace is the namespace of the route to customize.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of status.componentRoutes if the route is to be customized.", "type": "string", "default": "" }, - "value": { - "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", - "type": "string", - "default": "" + "servingCertKeyPairSecret": { + "description": "servingCertKeyPairSecret is a reference to a secret of type `kubernetes.io/tls` in the openshift-config namespace. The serving cert/key pair must match and will be used by the operator to fulfill the intent of serving with this name. If the custom hostname uses the default routing suffix of the cluster, the Secret specification for a serving certificate will not be needed.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "StringSource", + "Kind": "ComponentRouteSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.StringSourceSpec": { - "description": "StringSourceSpec specifies a string value, or external location", + "io.openshift.config.v1.ComponentRouteStatus": { + "description": "ComponentRouteStatus contains information allowing configuration of a route's hostname and serving certificate.", "type": "object", "required": [ - "value", - "env", - "file", - "keyFile" + "namespace", + "name", + "defaultHostname", + "relatedObjects" ], "properties": { - "env": { - "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", - "type": "string", - "default": "" + "conditions": { + "description": "conditions are used to communicate the state of the componentRoutes entry.\n\nSupported conditions include Available, Degraded and Progressing.\n\nIf available is true, the content served by the route can be accessed by users. This includes cases where a default may continue to serve content while the customized route specified by the cluster-admin is being configured.\n\nIf Degraded is true, that means something has gone wrong trying to handle the componentRoutes entry. The currentHostnames field may or may not be in effect.\n\nIf Progressing is true, that means the component is taking some action related to the componentRoutes entry.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "file": { - "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", + "consumingUsers": { + "description": "consumingUsers is a slice of ServiceAccounts that need to have read permission on the servingCertKeyPairSecret secret.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "currentHostnames": { + "description": "currentHostnames is the list of current names used by the route. Typically, this list should consist of a single hostname, but if multiple hostnames are supported by the route the operator may write multiple entries to this list.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "defaultHostname": { + "description": "defaultHostname is the hostname of this route prior to customization.", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile references a file containing the key to use to decrypt the value.", + "name": { + "description": "name is the logical name of the route to customize. It does not have to be the actual name of a route resource but it cannot be renamed.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of spec.componentRoutes if the route is to be customized.", "type": "string", "default": "" }, - "value": { - "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", + "namespace": { + "description": "namespace is the namespace of the route to customize. It must be a real namespace. Using an actual namespace ensures that no two components will conflict and the same component can be installed multiple times.\n\nThe namespace and name of this componentRoute must match a corresponding entry in the list of spec.componentRoutes if the route is to be customized.", "type": "string", "default": "" + }, + "relatedObjects": { + "description": "relatedObjects is a list of resources which are useful when debugging or inspecting how spec.componentRoutes is applied.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ObjectReference" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "StringSourceSpec", + "Kind": "ComponentRouteStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TLSProfileSpec": { - "description": "TLSProfileSpec is the desired behavior of a TLSSecurityProfile.", + "io.openshift.config.v1.ConditionalUpdate": { + "description": "ConditionalUpdate represents an update which is recommended to some clusters on the version the current cluster is reconciling, but which may not be recommended for the current cluster.", "type": "object", "required": [ - "ciphers", - "minTLSVersion" + "release", + "risks" ], "properties": { - "ciphers": { - "description": "ciphers is used to specify the cipher algorithms that are negotiated during the TLS handshake. Operators may remove entries their operands do not support. For example, to use DES-CBC3-SHA (yaml):\n\n ciphers:\n - DES-CBC3-SHA", + "conditions": { + "description": "conditions represents the observations of the conditional update's current status. Known types are: * Recommended, for whether the update is recommended for the current cluster.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" }, - "minTLSVersion": { - "description": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n minTLSVersion: VersionTLS11\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12", - "type": "string", - "default": "" + "release": { + "description": "release is the target of the update.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.Release" + }, + "risks": { + "description": "risks represents the range of issues associated with updating to the target release. The cluster-version operator will evaluate all entries, and only recommend the update if there is at least one entry and all entries recommend the update.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConditionalUpdateRisk" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "name", + "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TLSProfileSpec", + "Kind": "ConditionalUpdate", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TLSSecurityProfile": { - "description": "TLSSecurityProfile defines the schema for a TLS security profile. This object is used by operators to apply TLS security settings to operands.", + "io.openshift.config.v1.ConditionalUpdateRisk": { + "description": "ConditionalUpdateRisk represents a reason and cluster-state for not recommending a conditional update.", "type": "object", + "required": [ + "url", + "name", + "message", + "matchingRules" + ], "properties": { - "custom": { - "description": "custom is a user-defined TLS security profile. Be extremely careful using a custom profile as invalid configurations can be catastrophic. An example custom profile looks like this:\n\n ciphers:\n\n - ECDHE-ECDSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-AES128-GCM-SHA256\n\n - ECDHE-ECDSA-AES128-GCM-SHA256\n\n minTLSVersion: VersionTLS11", - "$ref": "#/definitions/io.openshift.config.v1.CustomTLSProfile" - }, - "intermediate": { - "description": "intermediate is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29\n\nand looks like this (yaml):\n\n ciphers:\n\n - TLS_AES_128_GCM_SHA256\n\n - TLS_AES_256_GCM_SHA384\n\n - TLS_CHACHA20_POLY1305_SHA256\n\n - ECDHE-ECDSA-AES128-GCM-SHA256\n\n - ECDHE-RSA-AES128-GCM-SHA256\n\n - ECDHE-ECDSA-AES256-GCM-SHA384\n\n - ECDHE-RSA-AES256-GCM-SHA384\n\n - ECDHE-ECDSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-CHACHA20-POLY1305\n\n - DHE-RSA-AES128-GCM-SHA256\n\n - DHE-RSA-AES256-GCM-SHA384\n\n minTLSVersion: VersionTLS12", - "$ref": "#/definitions/io.openshift.config.v1.IntermediateTLSProfile" + "matchingRules": { + "description": "matchingRules is a slice of conditions for deciding which clusters match the risk and which do not. The slice is ordered by decreasing precedence. The cluster-version operator will walk the slice in order, and stop after the first it can successfully evaluate. If no condition can be successfully evaluated, the update will not be recommended.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterCondition" + }, + "x-kubernetes-list-type": "atomic" }, - "modern": { - "description": "modern is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility\n\nand looks like this (yaml):\n\n ciphers:\n\n - TLS_AES_128_GCM_SHA256\n\n - TLS_AES_256_GCM_SHA384\n\n - TLS_CHACHA20_POLY1305_SHA256\n\n minTLSVersion: VersionTLS13", - "$ref": "#/definitions/io.openshift.config.v1.ModernTLSProfile" + "message": { + "description": "message provides additional information about the risk of updating, in the event that matchingRules match the cluster state. This is only to be consumed by humans. It may contain Line Feed characters (U+000A), which should be rendered as new lines.", + "type": "string", + "default": "" }, - "old": { - "description": "old is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility\n\nand looks like this (yaml):\n\n ciphers:\n\n - TLS_AES_128_GCM_SHA256\n\n - TLS_AES_256_GCM_SHA384\n\n - TLS_CHACHA20_POLY1305_SHA256\n\n - ECDHE-ECDSA-AES128-GCM-SHA256\n\n - ECDHE-RSA-AES128-GCM-SHA256\n\n - ECDHE-ECDSA-AES256-GCM-SHA384\n\n - ECDHE-RSA-AES256-GCM-SHA384\n\n - ECDHE-ECDSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-CHACHA20-POLY1305\n\n - DHE-RSA-AES128-GCM-SHA256\n\n - DHE-RSA-AES256-GCM-SHA384\n\n - DHE-RSA-CHACHA20-POLY1305\n\n - ECDHE-ECDSA-AES128-SHA256\n\n - ECDHE-RSA-AES128-SHA256\n\n - ECDHE-ECDSA-AES128-SHA\n\n - ECDHE-RSA-AES128-SHA\n\n - ECDHE-ECDSA-AES256-SHA384\n\n - ECDHE-RSA-AES256-SHA384\n\n - ECDHE-ECDSA-AES256-SHA\n\n - ECDHE-RSA-AES256-SHA\n\n - DHE-RSA-AES128-SHA256\n\n - DHE-RSA-AES256-SHA256\n\n - AES128-GCM-SHA256\n\n - AES256-GCM-SHA384\n\n - AES128-SHA256\n\n - AES256-SHA256\n\n - AES128-SHA\n\n - AES256-SHA\n\n - DES-CBC3-SHA\n\n minTLSVersion: VersionTLS10", - "$ref": "#/definitions/io.openshift.config.v1.OldTLSProfile" + "name": { + "description": "name is the CamelCase reason for not recommending a conditional update, in the event that matchingRules match the cluster state.", + "type": "string", + "default": "" }, - "type": { - "description": "type is one of Old, Intermediate, Modern or Custom. Custom provides the ability to specify individual TLS security profile parameters. Old, Intermediate and Modern are TLS security profiles based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations\n\nThe profiles are intent based, so they may change over time as new ciphers are developed and existing ciphers are found to be insecure. Depending on precisely which ciphers are available to a process, the list may be reduced.\n\nNote that the Modern profile is currently not supported because it is not yet well adopted by common software libraries.", + "url": { + "description": "url contains information about this risk.", "type": "string", "default": "" } @@ -24669,30 +25362,22 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TLSSecurityProfile", + "Kind": "ConditionalUpdateRisk", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "custom": "Custom", - "intermediate": "Intermediate", - "modern": "Modern", - "old": "Old" - } - } - ] + } }, - "io.openshift.config.v1.TemplateReference": { - "description": "TemplateReference references a template in a specific namespace. The namespace must be specified at the point of use.", + "io.openshift.config.v1.ConfigMapFileReference": { + "description": "ConfigMapFileReference references a config map in a specific namespace. The namespace must be specified at the point of use.", "type": "object", "required": [ "name" ], "properties": { + "key": { + "description": "Key allows pointing to a specific key/value inside of the configmap. This is useful for logical file references.", + "type": "string" + }, "name": { - "description": "name is the metadata.name of the referenced project request template", "type": "string", "default": "" } @@ -24701,18 +25386,19 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TemplateReference", + "Kind": "ConfigMapFileReference", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TestDetails": { + "io.openshift.config.v1.ConfigMapNameReference": { + "description": "ConfigMapNameReference references a config map in a specific namespace. The namespace must be specified at the point of use.", "type": "object", "required": [ - "testName" + "name" ], "properties": { - "testName": { - "description": "TestName is the name of the test as it appears in junit XMLs. It does not include the suite name since the same test can be executed in many suites.", + "name": { + "description": "name is the metadata.name of the referenced config map", "type": "string", "default": "" } @@ -24721,12 +25407,12 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TestDetails", + "Kind": "ConfigMapNameReference", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TestReporting": { - "description": "TestReporting is used for origin (and potentially others) to report the test names for a given FeatureGate into the payload for later analysis on a per-payload basis. This doesn't need any CRD because it's never stored in the cluster.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.Console": { + "description": "Console holds cluster-wide configuration for the web console, including the logout URL, and reports the public URL of the console. The canonical name is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -24746,111 +25432,104 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TestReportingSpec" + "$ref": "#/definitions/io.openshift.config.v1.ConsoleSpec" }, "status": { "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.TestReportingStatus" + "$ref": "#/definitions/io.openshift.config.v1.ConsoleStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TestReporting", - "Scope": "Namespaced" + "Kind": "Console", + "Scope": "Clustered" } }, - "io.openshift.config.v1.TestReportingSpec": { + "io.openshift.config.v1.ConsoleAuthentication": { + "description": "ConsoleAuthentication defines a list of optional configuration for console authentication.", "type": "object", - "required": [ - "testsForFeatureGates" - ], "properties": { - "testsForFeatureGates": { - "description": "TestsForFeatureGates is a list, indexed by FeatureGate and includes information about testing.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.FeatureGateTests" - } + "logoutRedirect": { + "description": "An optional, absolute URL to redirect web browsers to after logging out of the console. If not specified, it will redirect to the default login page. This is required when using an identity provider that supports single sign-on (SSO) such as: - OpenID (Keycloak, Azure) - RequestHeader (GSSAPI, SSPI, SAML) - OAuth (GitHub, GitLab, Google) Logging out of the console will destroy the user's token. The logoutRedirect provides the user the option to perform single logout (SLO) through the identity provider to destroy their single sign-on session.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TestReportingSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1.TestReportingStatus": { - "type": "object", - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1", - "Kind": "TestReportingStatus", + "Kind": "ConsoleAuthentication", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TokenClaimMapping": { + "io.openshift.config.v1.ConsoleList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "claim" + "metadata", + "items" ], "properties": { - "claim": { - "description": "Claim is a JWT token claim to be used in the mapping", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.Console" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TokenClaimMapping", + "Kind": "ConsoleList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TokenClaimMappings": { + "io.openshift.config.v1.ConsoleSpec": { + "description": "ConsoleSpec is the specification of the desired behavior of the Console.", "type": "object", "properties": { - "groups": { - "description": "Groups is a name of the claim that should be used to construct groups for the cluster identity. The referenced claim must use array of strings values.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.PrefixedClaimMapping" - }, - "username": { - "description": "Username is a name of the claim that should be used to construct usernames for the cluster identity.\n\nDefault value: \"sub\"", + "authentication": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.UsernameClaimMapping" + "$ref": "#/definitions/io.openshift.config.v1.ConsoleAuthentication" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TokenClaimMappings", + "Kind": "ConsoleSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TokenClaimValidationRule": { + "io.openshift.config.v1.ConsoleStatus": { + "description": "ConsoleStatus defines the observed status of the Console.", "type": "object", "required": [ - "type", - "requiredClaim" + "consoleURL" ], "properties": { - "requiredClaim": { - "description": "RequiredClaim allows configuring a required claim name and its expected value", - "$ref": "#/definitions/io.openshift.config.v1.TokenRequiredClaim" - }, - "type": { - "description": "Type sets the type of the validation rule", + "consoleURL": { + "description": "The URL for the console. This will be derived from the host for the route that is created for the console.", "type": "string", "default": "" } @@ -24859,61 +25538,57 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TokenClaimValidationRule", + "Kind": "ConsoleStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TokenConfig": { - "description": "TokenConfig holds the necessary configuration options for authorization and access tokens", + "io.openshift.config.v1.CustomFeatureGates": { "type": "object", "properties": { - "accessTokenInactivityTimeout": { - "description": "accessTokenInactivityTimeout defines the token inactivity timeout for tokens granted by any client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. Takes valid time duration string such as \"5m\", \"1.5h\" or \"2h45m\". The minimum allowed value for duration is 300s (5 minutes). If the timeout is configured per client, then that value takes precedence. If the timeout value is not specified and the client does not override the value, then tokens are valid until their lifetime.\n\nWARNING: existing tokens' timeout will not be affected (lowered) by changing this value", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "accessTokenInactivityTimeoutSeconds": { - "description": "accessTokenInactivityTimeoutSeconds - DEPRECATED: setting this field has no effect.", - "type": "integer", - "format": "int32" + "disabled": { + "description": "disabled is a list of all feature gates that you want to force off", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "accessTokenMaxAgeSeconds": { - "description": "accessTokenMaxAgeSeconds defines the maximum age of access tokens", - "type": "integer", - "format": "int32" + "enabled": { + "description": "enabled is a list of all feature gates that you want to force on", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TokenConfig", + "Kind": "CustomFeatureGates", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TokenIssuer": { + "io.openshift.config.v1.CustomTLSProfile": { + "description": "CustomTLSProfile is a user-defined TLS security profile. Be extremely careful using a custom TLS profile as invalid configurations can be catastrophic.", "type": "object", "required": [ - "issuerURL", - "audiences", - "issuerCertificateAuthority" + "ciphers", + "minTLSVersion" ], "properties": { - "audiences": { - "description": "Audiences is an array of audiences that the token was issued for. Valid tokens must include at least one of these values in their \"aud\" claim. Must be set to exactly one value.", + "ciphers": { + "description": "ciphers is used to specify the cipher algorithms that are negotiated during the TLS handshake. Operators may remove entries their operands do not support. For example, to use DES-CBC3-SHA (yaml):\n\n ciphers:\n - DES-CBC3-SHA", "type": "array", "items": { "type": "string", "default": "" }, - "x-kubernetes-list-type": "set" - }, - "issuerCertificateAuthority": { - "description": "CertificateAuthority is a reference to a config map in the configuration namespace. The .data of the configMap must contain the \"ca-bundle.crt\" key. If unset, system trust is used instead.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + "x-kubernetes-list-type": "atomic" }, - "issuerURL": { - "description": "URL is the serving URL of the token issuer. Must use the https:// scheme.", + "minTLSVersion": { + "description": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n minTLSVersion: VersionTLS11\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12", "type": "string", "default": "" } @@ -24922,110 +25597,99 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TokenIssuer", + "Kind": "CustomTLSProfile", "Scope": "Namespaced" } }, - "io.openshift.config.v1.TokenRequiredClaim": { + "io.openshift.config.v1.DNS": { + "description": "DNS holds cluster-wide information about DNS. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "claim", - "requiredValue" + "spec" ], "properties": { - "claim": { - "description": "Claim is a name of a required claim. Only claims with string values are supported.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "requiredValue": { - "description": "RequiredValue is the required value for the claim.", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DNSSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DNSStatus" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "config.openshift.io", "Version": "v1", - "Kind": "TokenRequiredClaim", - "Scope": "Namespaced" + "Kind": "DNS", + "Scope": "Clustered" } }, - "io.openshift.config.v1.Update": { - "description": "Update represents an administrator update request.", + "io.openshift.config.v1.DNSList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "metadata", + "items" + ], "properties": { - "architecture": { - "description": "architecture is an optional field that indicates the desired value of the cluster architecture. In this context cluster architecture means either a single architecture or a multi architecture. architecture can only be set to Multi thereby only allowing updates from single to multi architecture. If architecture is set, image cannot be set and version must be set. Valid values are 'Multi' and empty.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "force": { - "description": "force allows an administrator to update to an image that has failed verification or upgradeable checks. This option should only be used when the authenticity of the provided image has been verified out of band because the provided image will run with full administrative access to the cluster. Do not use this flag with images that comes from unknown or potentially malicious sources.", - "type": "boolean", - "default": false + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DNS" + } }, - "image": { - "description": "image is a container image location that contains the update. image should be used when the desired version does not exist in availableUpdates or history. When image is set, version is ignored. When image is set, version should be empty. When image is set, architecture cannot be specified.", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "version": { - "description": "version is a semantic version identifying the update version. version is ignored if image is specified and required if architecture is specified.", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "list", "Group": "config.openshift.io", "Version": "v1", - "Kind": "Update", + "Kind": "DNSList", "Scope": "Namespaced" } }, - "io.openshift.config.v1.UpdateHistory": { - "description": "UpdateHistory is a single attempted update to the cluster.", + "io.openshift.config.v1.DNSPlatformSpec": { + "description": "DNSPlatformSpec holds cloud-provider-specific configuration for DNS administration.", "type": "object", "required": [ - "state", - "startedTime", - "completionTime", - "image", - "verified" + "type" ], "properties": { - "acceptedRisks": { - "description": "acceptedRisks records risks which were accepted to initiate the update. For example, it may menition an Upgradeable=False or missing signature that was overriden via desiredUpdate.force, or an update that was initiated despite not being in the availableUpdates set of recommended update targets.", - "type": "string" - }, - "completionTime": { - "description": "completionTime, if set, is when the update was fully applied. The update that is currently being applied will have a null completion time. Completion time will always be set for entries that are not the current update (usually to the started time of the next update).", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "image": { - "description": "image is a container image location that contains the update. This value is always populated.", - "type": "string", - "default": "" - }, - "startedTime": { - "description": "startedTime is the time at which the update was started.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "state": { - "description": "state reflects whether the update was fully applied. The Partial state indicates the update is not fully applied, while the Completed state indicates the update was successfully rolled out at least once (all parts of the update successfully applied).", - "type": "string", - "default": "" - }, - "verified": { - "description": "verified indicates whether the provided update was properly verified before it was installed. If this is false the cluster may not be trusted. Verified does not cover upgradeable checks that depend on the cluster state at the time when the update target was accepted.", - "type": "boolean", - "default": false + "aws": { + "description": "aws contains DNS configuration specific to the Amazon Web Services cloud provider.", + "$ref": "#/definitions/io.openshift.config.v1.AWSDNSSpec" }, - "version": { - "description": "version is a semantic version identifying the update version. If the requested image does not define a version, or if a failure occurs retrieving the image, this value may be empty.", + "type": { + "description": "type is the underlying infrastructure provider for the cluster. Allowed values: \"\", \"AWS\".\n\nIndividual components may not support all platforms, and must handle unrecognized platforms with best-effort defaults.", "type": "string", "default": "" } @@ -25034,346 +25698,266 @@ "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "UpdateHistory", + "Kind": "DNSPlatformSpec", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "aws": "AWS" + } + } + ] }, - "io.openshift.config.v1.UsernameClaimMapping": { + "io.openshift.config.v1.DNSSpec": { "type": "object", "required": [ - "claim", - "prefixPolicy", - "prefix" + "baseDomain" ], "properties": { - "claim": { - "description": "Claim is a JWT token claim to be used in the mapping", + "baseDomain": { + "description": "baseDomain is the base domain of the cluster. All managed DNS records will be sub-domains of this base.\n\nFor example, given the base domain `openshift.example.com`, an API server DNS record may be created for `cluster-api.openshift.example.com`.\n\nOnce set, this field cannot be changed.", "type": "string", "default": "" }, - "prefix": { - "$ref": "#/definitions/io.openshift.config.v1.UsernamePrefix" + "platform": { + "description": "platform holds configuration specific to the underlying infrastructure provider for DNS. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DNSPlatformSpec" }, - "prefixPolicy": { - "description": "PrefixPolicy specifies how a prefix should apply.\n\nBy default, claims other than `email` will be prefixed with the issuer URL to prevent naming clashes with other plugins.\n\nSet to \"NoPrefix\" to disable prefixing.\n\nExample:\n (1) `prefix` is set to \"myoidc:\" and `claim` is set to \"username\".\n If the JWT claim `username` contains value `userA`, the resulting\n mapped value will be \"myoidc:userA\".\n (2) `prefix` is set to \"myoidc:\" and `claim` is set to \"email\". If the\n JWT `email` claim contains value \"userA@myoidc.tld\", the resulting\n mapped value will be \"myoidc:userA@myoidc.tld\".\n (3) `prefix` is unset, `issuerURL` is set to `https://myoidc.tld`,\n the JWT claims include \"username\":\"userA\" and \"email\":\"userA@myoidc.tld\",\n and `claim` is set to:\n (a) \"username\": the mapped value will be \"https://myoidc.tld#userA\"\n (b) \"email\": the mapped value will be \"userA@myoidc.tld\"", - "type": "string", - "default": "" + "privateZone": { + "description": "privateZone is the location where all the DNS records that are only available internally to the cluster exist.\n\nIf this field is nil, no private records should be created.\n\nOnce set, this field cannot be changed.", + "$ref": "#/definitions/io.openshift.config.v1.DNSZone" + }, + "publicZone": { + "description": "publicZone is the location where all the DNS records that are publicly accessible to the internet exist.\n\nIf this field is nil, no public records should be created.\n\nOnce set, this field cannot be changed.", + "$ref": "#/definitions/io.openshift.config.v1.DNSZone" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "UsernameClaimMapping", + "Kind": "DNSSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.UsernamePrefix": { + "io.openshift.config.v1.DNSStatus": { + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "DNSStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.DNSZone": { + "description": "DNSZone is used to define a DNS hosted zone. A zone can be identified by an ID or tags.", "type": "object", - "required": [ - "prefixString" - ], "properties": { - "prefixString": { - "type": "string", - "default": "" + "id": { + "description": "id is the identifier that can be used to find the DNS hosted zone.\n\non AWS zone can be fetched using `ID` as id in [1] on Azure zone can be fetched using `ID` as a pre-determined name in [2], on GCP zone can be fetched using `ID` as a pre-determined name in [3].\n\n[1]: https://docs.aws.amazon.com/cli/latest/reference/route53/get-hosted-zone.html#options [2]: https://docs.microsoft.com/en-us/cli/azure/network/dns/zone?view=azure-cli-latest#az-network-dns-zone-show [3]: https://cloud.google.com/dns/docs/reference/v1/managedZones/get", + "type": "string" + }, + "tags": { + "description": "tags can be used to query the DNS hosted zone.\n\non AWS, resourcegroupstaggingapi [1] can be used to fetch a zone using `Tags` as tag-filters,\n\n[1]: https://docs.aws.amazon.com/cli/latest/reference/resourcegroupstaggingapi/get-resources.html#options", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "UsernamePrefix", + "Kind": "DNSZone", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformFailureDomainSpec": { - "description": "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.", + "io.openshift.config.v1.DelegatedAuthentication": { + "description": "DelegatedAuthentication allows authentication to be disabled.", "type": "object", - "required": [ - "name", - "region", - "zone", - "server", - "topology" - ], "properties": { - "name": { - "description": "name defines the arbitrary but unique name of a failure domain.", - "type": "string", - "default": "" - }, - "region": { - "description": "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.", - "type": "string", - "default": "" - }, - "server": { - "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", - "type": "string", - "default": "" - }, - "topology": { - "description": "Topology describes a given failure domain using vSphere constructs", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformTopology" - }, - "zone": { - "description": "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.", - "type": "string", - "default": "" + "disabled": { + "description": "disabled indicates that authentication should be disabled. By default it will use delegated authentication.", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformFailureDomainSpec", + "Kind": "DelegatedAuthentication", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformLoadBalancer": { - "description": "VSpherePlatformLoadBalancer defines the load balancer used by the cluster on VSphere platform.", + "io.openshift.config.v1.DelegatedAuthorization": { + "description": "DelegatedAuthorization allows authorization to be disabled.", "type": "object", "properties": { - "type": { - "description": "type defines the type of load balancer used by the cluster on VSphere platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", - "type": "string", - "default": "OpenShiftManagedDefault" + "disabled": { + "description": "disabled indicates that authorization should be disabled. By default it will use delegated authorization.", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformLoadBalancer", + "Kind": "DelegatedAuthorization", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": {} - } - ] + } }, - "io.openshift.config.v1.VSpherePlatformNodeNetworking": { - "description": "VSpherePlatformNodeNetworking holds the external and internal node networking spec.", + "io.openshift.config.v1.DeprecatedWebhookTokenAuthenticator": { + "description": "deprecatedWebhookTokenAuthenticator holds the necessary configuration options for a remote token authenticator. It's the same as WebhookTokenAuthenticator but it's missing the 'required' validation on KubeConfig field.", "type": "object", + "required": [ + "kubeConfig" + ], "properties": { - "external": { - "description": "external represents the network configuration of the node that is externally routable.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworkingSpec" - }, - "internal": { - "description": "internal represents the network configuration of the node that is routable only within the cluster.", + "kubeConfig": { + "description": "kubeConfig contains kube config file data which describes how to access the remote webhook service. For further details, see: https://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication The key \"kubeConfig\" is used to locate the data. If the secret or expected key is not found, the webhook is not honored. If the specified kube config data is not valid, the webhook is not honored. The namespace for this secret is determined by the point of use.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworkingSpec" + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformNodeNetworking", + "Kind": "DeprecatedWebhookTokenAuthenticator", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformNodeNetworkingSpec": { - "description": "VSpherePlatformNodeNetworkingSpec holds the network CIDR(s) and port group name for including and excluding IP ranges in the cloud provider. This would be used for example when multiple network adapters are attached to a guest to help determine which IP address the cloud config manager should use for the external and internal node networking.", + "io.openshift.config.v1.EquinixMetalPlatformSpec": { + "description": "EquinixMetalPlatformSpec holds the desired state of the Equinix Metal infrastructure provider. This only includes fields that can be modified in the cluster.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "EquinixMetalPlatformSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.EquinixMetalPlatformStatus": { + "description": "EquinixMetalPlatformStatus holds the current status of the Equinix Metal infrastructure provider.", "type": "object", "properties": { - "excludeNetworkSubnetCidr": { - "description": "excludeNetworkSubnetCidr IP addresses in subnet ranges will be excluded when selecting the IP address from the VirtualMachine's VM for use in the status.addresses fields.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "network": { - "description": "network VirtualMachine's VM Network names that will be used to when searching for status.addresses fields. Note that if internal.networkSubnetCIDR and external.networkSubnetCIDR are not set, then the vNIC associated to this network must only have a single IP address assigned to it. The available networks (port groups) can be listed using `govc ls 'network/*'`", + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.", "type": "string" }, - "networkSubnetCidr": { - "description": "networkSubnetCidr IP address on VirtualMachine's network interfaces included in the fields' CIDRs that will be used in respective status.addresses fields.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformNodeNetworkingSpec", + "Kind": "EquinixMetalPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformSpec": { - "description": "VSpherePlatformSpec holds the desired state of the vSphere infrastructure provider. In the future the cloud provider operator, storage operator and machine operator will use these fields for configuration.", + "io.openshift.config.v1.EtcdConnectionInfo": { + "description": "EtcdConnectionInfo holds information necessary for connecting to an etcd server", "type": "object", + "required": [ + "ca", + "certFile", + "keyFile" + ], "properties": { - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.apiServerInternalIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "ca": { + "description": "CA is a file containing trusted roots for the etcd server certificates", + "type": "string", + "default": "" }, - "failureDomains": { - "description": "failureDomains contains the definition of region, zone and the vCenter topology. If this is omitted failure domains (regions and zones) will not be used.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformFailureDomainSpec" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.ingressIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" }, - "machineNetworks": { - "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6, for example \"10.0.0.0/8\" or \"fd00::/8\".", + "urls": { + "description": "URLs are the URLs for etcd", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "nodeNetworking": { - "description": "nodeNetworking contains the definition of internal and external network constraints for assigning the node's networking. If this field is omitted, networking defaults to the legacy address selection behavior which is to only support a single address and return the first one found.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworking" - }, - "vcenters": { - "description": "vcenters holds the connection details for services to communicate with vCenter. Currently, only a single vCenter is supported.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformVCenterSpec" - }, - "x-kubernetes-list-type": "atomic" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformSpec", + "Kind": "EtcdConnectionInfo", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformStatus": { - "description": "VSpherePlatformStatus holds the current status of the vSphere infrastructure provider.", + "io.openshift.config.v1.EtcdStorageConfig": { "type": "object", "required": [ - "apiServerInternalIPs", - "ingressIPs" - ], + "ca", + "certFile", + "keyFile", + "storagePrefix" + ], "properties": { - "apiServerInternalIP": { - "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", - "type": "string" - }, - "apiServerInternalIPs": { - "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "ca": { + "description": "CA is a file containing trusted roots for the etcd server certificates", + "type": "string", + "default": "" }, - "ingressIP": { - "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", - "type": "string" + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" }, - "ingressIPs": { - "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" }, - "loadBalancer": { - "description": "loadBalancer defines how the load balancer used by the cluster is configured.", - "default": { - "type": "OpenShiftManagedDefault" - }, - "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformLoadBalancer" + "storagePrefix": { + "description": "StoragePrefix is the path within etcd that the OpenShift resources will be rooted under. This value, if changed, will mean existing objects in etcd will no longer be located.", + "type": "string", + "default": "" }, - "machineNetworks": { - "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes.", + "urls": { + "description": "URLs are the URLs for etcd", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "nodeDNSIP": { - "description": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for vSphere deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", - "type": "string" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformStatus", + "Kind": "EtcdStorageConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformTopology": { - "description": "VSpherePlatformTopology holds the required and optional vCenter objects - datacenter, computeCluster, networks, datastore and resourcePool - to provision virtual machines.", + "io.openshift.config.v1.ExternalIPConfig": { + "description": "ExternalIPConfig specifies some IP blocks relevant for the ExternalIP field of a Service resource.", "type": "object", - "required": [ - "datacenter", - "computeCluster", - "networks", - "datastore" - ], "properties": { - "computeCluster": { - "description": "computeCluster the absolute path of the vCenter cluster in which virtual machine will be located. The absolute path is of the form /\u003cdatacenter\u003e/host/\u003ccluster\u003e. The maximum length of the path is 2048 characters.", - "type": "string", - "default": "" - }, - "datacenter": { - "description": "datacenter is the name of vCenter datacenter in which virtual machines will be located. The maximum length of the datacenter name is 80 characters.", - "type": "string", - "default": "" - }, - "datastore": { - "description": "datastore is the absolute path of the datastore in which the virtual machine is located. The absolute path is of the form /\u003cdatacenter\u003e/datastore/\u003cdatastore\u003e The maximum length of the path is 2048 characters.", - "type": "string", - "default": "" - }, - "folder": { - "description": "folder is the absolute path of the folder where virtual machines are located. The absolute path is of the form /\u003cdatacenter\u003e/vm/\u003cfolder\u003e. The maximum length of the path is 2048 characters.", - "type": "string" - }, - "networks": { - "description": "networks is the list of port group network names within this failure domain. Currently, we only support a single interface per RHCOS virtual machine. The available networks (port groups) can be listed using `govc ls 'network/*'` The single interface should be the absolute path of the form /\u003cdatacenter\u003e/network/\u003cportgroup\u003e.", + "autoAssignCIDRs": { + "description": "autoAssignCIDRs is a list of CIDRs from which to automatically assign Service.ExternalIP. These are assigned when the service is of type LoadBalancer. In general, this is only useful for bare-metal clusters. In Openshift 3.x, this was misleadingly called \"IngressIPs\". Automatically assigned External IPs are not affected by any ExternalIPPolicy rules. Currently, only one entry may be provided.", "type": "array", "items": { "type": "string", @@ -25381,82 +25965,88 @@ }, "x-kubernetes-list-type": "atomic" }, - "resourcePool": { - "description": "resourcePool is the absolute path of the resource pool where virtual machines will be created. The absolute path is of the form /\u003cdatacenter\u003e/host/\u003ccluster\u003e/Resources/\u003cresourcepool\u003e. The maximum length of the path is 2048 characters.", - "type": "string" - }, - "template": { - "description": "template is the full inventory path of the virtual machine or template that will be cloned when creating new machines in this failure domain. The maximum length of the path is 2048 characters.\n\nWhen omitted, the template will be calculated by the control plane machineset operator based on the region and zone defined in VSpherePlatformFailureDomainSpec. For example, for zone=zonea, region=region1, and infrastructure name=test, the template path would be calculated as /\u003cdatacenter\u003e/vm/test-rhcos-region1-zonea.", - "type": "string" + "policy": { + "description": "policy is a set of restrictions applied to the ExternalIP field. If nil or empty, then ExternalIP is not allowed to be set.", + "$ref": "#/definitions/io.openshift.config.v1.ExternalIPPolicy" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformTopology", + "Kind": "ExternalIPConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1.VSpherePlatformVCenterSpec": { - "description": "VSpherePlatformVCenterSpec stores the vCenter connection fields. This is used by the vSphere CCM.", + "io.openshift.config.v1.ExternalIPPolicy": { + "description": "ExternalIPPolicy configures exactly which IPs are allowed for the ExternalIP field in a Service. If the zero struct is supplied, then none are permitted. The policy controller always allows automatically assigned external IPs.", "type": "object", - "required": [ - "server", - "datacenters" - ], "properties": { - "datacenters": { - "description": "The vCenter Datacenters in which the RHCOS vm guests are located. This field will be used by the Cloud Controller Manager. Each datacenter listed here should be used within a topology.", + "allowedCIDRs": { + "description": "allowedCIDRs is the list of allowed CIDRs.", "type": "array", "items": { "type": "string", "default": "" }, - "x-kubernetes-list-type": "set" - }, - "port": { - "description": "port is the TCP port that will be used to communicate to the vCenter endpoint. When omitted, this means the user has no opinion and it is up to the platform to choose a sensible default, which is subject to change over time.", - "type": "integer", - "format": "int32" + "x-kubernetes-list-type": "atomic" }, - "server": { - "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", + "rejectedCIDRs": { + "description": "rejectedCIDRs is the list of disallowed CIDRs. These take precedence over allowedCIDRs.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ExternalIPPolicy", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ExternalPlatformSpec": { + "description": "ExternalPlatformSpec holds the desired state for the generic External infrastructure provider.", + "type": "object", + "properties": { + "platformName": { + "description": "PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.", "type": "string", - "default": "" + "default": "Unknown" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "VSpherePlatformVCenterSpec", + "Kind": "ExternalPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1.WebhookTokenAuthenticator": { - "description": "webhookTokenAuthenticator holds the necessary configuration options for a remote token authenticator", + "io.openshift.config.v1.ExternalPlatformStatus": { + "description": "ExternalPlatformStatus holds the current status of the generic External infrastructure provider.", "type": "object", - "required": [ - "kubeConfig" - ], "properties": { - "kubeConfig": { - "description": "kubeConfig references a secret that contains kube config file data which describes how to access the remote webhook service. The namespace for the referenced secret is openshift-config.\n\nFor further details, see:\n\nhttps://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication\n\nThe key \"kubeConfig\" is used to locate the data. If the secret or expected key is not found, the webhook is not honored. If the specified kube config data is not valid, the webhook is not honored.", + "cloudControllerManager": { + "description": "cloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI). When omitted, new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "$ref": "#/definitions/io.openshift.config.v1.CloudControllerManagerStatus" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", "Version": "v1", - "Kind": "WebhookTokenAuthenticator", + "Kind": "ExternalPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.Backup": { - "description": "Backup provides configuration for performing backups of the openshift cluster.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.FeatureGate": { + "description": "Feature holds cluster-wide information about feature gates. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -25478,24 +26068,80 @@ "spec": { "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.BackupSpec" + "$ref": "#/definitions/io.openshift.config.v1.FeatureGateSpec" }, "status": { "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.BackupStatus" + "$ref": "#/definitions/io.openshift.config.v1.FeatureGateStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "Backup", + "Version": "v1", + "Kind": "FeatureGate", "Scope": "Clustered" } }, - "io.openshift.config.v1alpha1.BackupList": { - "description": "BackupList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.FeatureGateAttributes": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name is the name of the FeatureGate.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "FeatureGateAttributes", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.FeatureGateDetails": { + "type": "object", + "required": [ + "version" + ], + "properties": { + "disabled": { + "description": "disabled is a list of all feature gates that are disabled in the cluster for the named version.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.FeatureGateAttributes" + } + }, + "enabled": { + "description": "enabled is a list of all feature gates that are enabled in the cluster for the named version.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.FeatureGateAttributes" + } + }, + "version": { + "description": "version matches the version provided by the ClusterVersion and in the ClusterOperator.Status.Versions field.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "FeatureGateDetails", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.FeatureGateList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -25510,7 +26156,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.Backup" + "$ref": "#/definitions/io.openshift.config.v1.FeatureGate" } }, "kind": { @@ -25526,160 +26172,192 @@ "x-fabric8-info": { "Type": "list", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "BackupList", + "Version": "v1", + "Kind": "FeatureGateList", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.BackupSpec": { + "io.openshift.config.v1.FeatureGateSelection": { "type": "object", - "required": [ - "etcd" - ], "properties": { - "etcd": { - "description": "etcd specifies the configuration for periodic backups of the etcd cluster", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.EtcdBackupSpec" + "customNoUpgrade": { + "description": "customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES. Because of its nature, this setting cannot be validated. If you have any typos or accidentally apply invalid combinations your cluster may fail in an unrecoverable way. featureSet must equal \"CustomNoUpgrade\" must be set to use this field.", + "$ref": "#/definitions/io.openshift.config.v1.CustomFeatureGates" + }, + "featureSet": { + "description": "featureSet changes the list of features in the cluster. The default is empty. Be very careful adjusting this setting. Turning on or off features may cause irreversible changes in your cluster which cannot be undone.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "BackupSpec", + "Version": "v1", + "Kind": "FeatureGateSelection", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "featureSet", + "fields-to-discriminateBy": { + "customNoUpgrade": "CustomNoUpgrade" + } + } + ] }, - "io.openshift.config.v1alpha1.BackupStatus": { + "io.openshift.config.v1.FeatureGateSpec": { "type": "object", + "properties": { + "customNoUpgrade": { + "description": "customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES. Because of its nature, this setting cannot be validated. If you have any typos or accidentally apply invalid combinations your cluster may fail in an unrecoverable way. featureSet must equal \"CustomNoUpgrade\" must be set to use this field.", + "$ref": "#/definitions/io.openshift.config.v1.CustomFeatureGates" + }, + "featureSet": { + "description": "featureSet changes the list of features in the cluster. The default is empty. Be very careful adjusting this setting. Turning on or off features may cause irreversible changes in your cluster which cannot be undone.", + "type": "string" + } + }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "BackupStatus", + "Version": "v1", + "Kind": "FeatureGateSpec", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "featureSet", + "fields-to-discriminateBy": { + "customNoUpgrade": "CustomNoUpgrade" + } + } + ] }, - "io.openshift.config.v1alpha1.ClusterImagePolicy": { - "description": "ClusterImagePolicy holds cluster-wide configuration for image signature verification\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.FeatureGateStatus": { "type": "object", "required": [ - "spec" + "featureGates" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec contains the configuration for the cluster image policy.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.ClusterImagePolicySpec" + "conditions": { + "description": "conditions represent the observations of the current state. Known .status.conditions.type are: \"DeterminationDegraded\"", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "status": { - "description": "status contains the observed state of the resource.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.ClusterImagePolicyStatus" + "featureGates": { + "description": "featureGates contains a list of enabled and disabled featureGates that are keyed by payloadVersion. Operators other than the CVO and cluster-config-operator, must read the .status.featureGates, locate the version they are managing, find the enabled/disabled featuregates and make the operand and operator match. The enabled/disabled values for a particular version may change during the life of the cluster as various .spec.featureSet values are selected. Operators may choose to restart their processes to pick up these changes, but remembering past enable/disable lists is beyond the scope of this API and is the responsibility of individual operators. Only featureGates with .version in the ClusterVersion.status will be present in this list.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.FeatureGateDetails" + }, + "x-kubernetes-list-map-keys": [ + "version" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ClusterImagePolicy", - "Scope": "Clustered" + "Version": "v1", + "Kind": "FeatureGateStatus", + "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ClusterImagePolicyList": { - "description": "ClusterImagePolicyList is a list of ClusterImagePolicy resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.FeatureGateTests": { "type": "object", "required": [ - "metadata", - "items" + "featureGate", + "tests" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "featureGate": { + "description": "FeatureGate is the name of the FeatureGate as it appears in The FeatureGate CR instance.", + "type": "string", + "default": "" }, - "items": { + "tests": { + "description": "Tests contains an item for every TestName", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.ClusterImagePolicy" + "$ref": "#/definitions/io.openshift.config.v1.TestDetails" } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ClusterImagePolicyList", + "Version": "v1", + "Kind": "FeatureGateTests", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ClusterImagePolicySpec": { - "description": "CLusterImagePolicySpec is the specification of the ClusterImagePolicy custom resource.", + "io.openshift.config.v1.GCPPlatformSpec": { + "description": "GCPPlatformSpec holds the desired state of the Google Cloud Platform infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", - "required": [ - "scopes", - "policy" - ], - "properties": { - "policy": { - "description": "policy contains configuration to allow scopes to be verified, and defines how images not matching the verification policy will be treated.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.Policy" - }, - "scopes": { - "description": "scopes defines the list of image identities assigned to a policy. Each item refers to a scope in a registry implementing the \"Docker Registry HTTP API V2\". Scopes matching individual images are named Docker references in the fully expanded form, either using a tag or digest. For example, docker.io/library/busybox:latest (not busybox:latest). More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest), a repository namespace, or a registry host (by only specifying the host name and possibly a port number) or a wildcard expression starting with `*.`, for matching all subdomains (not including a port number). Wildcards are only supported for subdomain matching, and may not be used in the middle of the host, i.e. *.example.com is a valid case, but example*.*.com is not. If multiple scopes match a given image, only the policy requirements for the most specific scope apply. The policy requirements for more general scopes are ignored. In addition to setting a policy appropriate for your own deployed applications, make sure that a policy on the OpenShift image repositories quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev (or on a more general scope) allows deployment of the OpenShift images required for cluster operation. For additional details about the format, please refer to the document explaining the docker transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ClusterImagePolicySpec", + "Version": "v1", + "Kind": "GCPPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ClusterImagePolicyStatus": { + "io.openshift.config.v1.GCPPlatformStatus": { + "description": "GCPPlatformStatus holds the current status of the Google Cloud Platform infrastructure provider.", "type": "object", + "required": [ + "projectID", + "region" + ], "properties": { - "conditions": { - "description": "conditions provide details on the status of this API Resource.", + "cloudLoadBalancerConfig": { + "description": "cloudLoadBalancerConfig is a union that contains the IP addresses of API, API-Int and Ingress Load Balancers created on the cloud platform. These values would not be populated on on-prem platforms. These Load Balancer IPs are used to configure the in-cluster DNS instances for API, API-Int and Ingress services. `dnsType` is expected to be set to `ClusterHosted` when these Load Balancer IP addresses are populated and used.", + "default": { + "dnsType": "PlatformDefault" + }, + "$ref": "#/definitions/io.openshift.config.v1.CloudLoadBalancerConfig" + }, + "projectID": { + "description": "resourceGroupName is the Project ID for new GCP resources created for the cluster.", + "type": "string", + "default": "" + }, + "region": { + "description": "region holds the region for new GCP resources created for the cluster.", + "type": "string", + "default": "" + }, + "resourceLabels": { + "description": "resourceLabels is a list of additional labels to apply to GCP resources created for the cluster. See https://cloud.google.com/compute/docs/labeling-resources for information on labeling GCP resources. GCP supports a maximum of 64 labels per resource. OpenShift reserves 32 labels for internal use, allowing 32 labels for user configuration.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + "$ref": "#/definitions/io.openshift.config.v1.GCPResourceLabel" }, "x-kubernetes-list-map-keys": [ - "type" + "key" + ], + "x-kubernetes-list-type": "map" + }, + "resourceTags": { + "description": "resourceTags is a list of additional tags to apply to GCP resources created for the cluster. See https://cloud.google.com/resource-manager/docs/tags/tags-overview for information on tagging GCP resources. GCP supports a maximum of 50 tags per resource.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.GCPResourceTag" + }, + "x-kubernetes-list-map-keys": [ + "key" ], "x-kubernetes-list-type": "map" } @@ -25687,32 +26365,26 @@ "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ClusterImagePolicyStatus", + "Version": "v1", + "Kind": "GCPPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.EtcdBackupSpec": { - "description": "EtcdBackupSpec provides configuration for automated etcd backups to the cluster-etcd-operator", + "io.openshift.config.v1.GCPResourceLabel": { + "description": "GCPResourceLabel is a label to apply to GCP resources created for the cluster.", "type": "object", + "required": [ + "key", + "value" + ], "properties": { - "pvcName": { - "description": "PVCName specifies the name of the PersistentVolumeClaim (PVC) which binds a PersistentVolume where the etcd backup files would be saved The PVC itself must always be created in the \"openshift-etcd\" namespace If the PVC is left unspecified \"\" then the platform will choose a reasonable default location to save the backup. In the future this would be backups saved across the control-plane master nodes.", - "type": "string", - "default": "" - }, - "retentionPolicy": { - "description": "RetentionPolicy defines the retention policy for retaining and deleting existing backups.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.RetentionPolicy" - }, - "schedule": { - "description": "Schedule defines the recurring backup schedule in Cron format every 2 hours: 0 */2 * * * every day at 3am: 0 3 * * * Empty string means no opinion and the platform is left to choose a reasonable default which is subject to change without notice. The current default is \"no backups\", but will change in the future.", + "key": { + "description": "key is the key part of the label. A label key can have a maximum of 63 characters and cannot be empty. Label key must begin with a lowercase letter, and must contain only lowercase letters, numeric characters, and the following special characters `_-`. Label key must not have the reserved prefixes `kubernetes-io` and `openshift-io`.", "type": "string", "default": "" }, - "timeZone": { - "description": "The time zone name for the given schedule, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. If not specified, this will default to the time zone of the kube-controller-manager process. See https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#time-zones", + "value": { + "description": "value is the value part of the label. A label value can have a maximum of 63 characters and cannot be empty. Value must contain only lowercase letters, numeric characters, and the following special characters `_-`.", "type": "string", "default": "" } @@ -25720,343 +26392,476 @@ "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "EtcdBackupSpec", + "Version": "v1", + "Kind": "GCPResourceLabel", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.FulcioCAWithRekor": { - "description": "FulcioCAWithRekor defines the root of trust based on the Fulcio certificate and the Rekor public key.", + "io.openshift.config.v1.GCPResourceTag": { + "description": "GCPResourceTag is a tag to apply to GCP resources created for the cluster.", "type": "object", "required": [ - "fulcioCAData", - "rekorKeyData" + "parentID", + "key", + "value" ], "properties": { - "fulcioCAData": { - "description": "fulcioCAData contains inline base64-encoded data for the PEM format fulcio CA. fulcioCAData must be at most 8192 characters.", + "key": { + "description": "key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty. Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `._-`.", "type": "string", - "format": "byte" + "default": "" }, - "fulcioSubject": { - "description": "fulcioSubject specifies OIDC issuer and the email of the Fulcio authentication configuration.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyFulcioSubject" + "parentID": { + "description": "parentID is the ID of the hierarchical resource where the tags are defined, e.g. at the Organization or the Project level. To find the Organization or Project ID refer to the following pages: https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id, https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects. An OrganizationID must consist of decimal numbers, and cannot have leading zeroes. A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers, and hyphens, and must start with a letter, and cannot end with a hyphen.", + "type": "string", + "default": "" }, - "rekorKeyData": { - "description": "rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key. rekorKeyData must be at most 8192 characters.", + "value": { + "description": "value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty. Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `_-.@%=+:,*#\u0026(){}[]` and spaces.", "type": "string", - "format": "byte" + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "FulcioCAWithRekor", + "Version": "v1", + "Kind": "GCPResourceTag", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.GatherConfig": { - "description": "gatherConfig provides data gathering configuration options.", + "io.openshift.config.v1.GenericAPIServerConfig": { + "description": "GenericAPIServerConfig is an inline-able struct for aggregated apiservers that need to store data in etcd", "type": "object", + "required": [ + "servingInfo", + "corsAllowedOrigins", + "auditConfig", + "storageConfig", + "admission", + "kubeClientConfig" + ], "properties": { - "dataPolicy": { - "description": "dataPolicy allows user to enable additional global obfuscation of the IP addresses and base domain in the Insights archive data. Valid values are \"None\" and \"ObfuscateNetworking\". When set to None the data is not obfuscated. When set to ObfuscateNetworking the IP addresses and the cluster domain name are obfuscated. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is None.", - "type": "string" + "admission": { + "description": "admissionConfig holds information about how to configure admission.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" }, - "disabledGatherers": { - "description": "disabledGatherers is a list of gatherers to be excluded from the gathering. All the gatherers can be disabled by providing \"all\" value. If all the gatherers are disabled, the Insights operator does not gather any data. The particular gatherers IDs can be found at https://github.com/openshift/insights-operator/blob/master/docs/gathered-data.md. Run the following command to get the names of last active gatherers: \"oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'\" An example of disabling gatherers looks like this: `disabledGatherers: [\"clusterconfig/machine_configs\", \"workloads/workload_info\"]`", + "auditConfig": { + "description": "auditConfig describes how to configure audit information", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" + }, + "corsAllowedOrigins": { + "description": "corsAllowedOrigins", "type": "array", "items": { "type": "string", "default": "" } + }, + "kubeClientConfig": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" + }, + "servingInfo": { + "description": "servingInfo describes how to start serving", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + }, + "storageConfig": { + "description": "storageConfig contains information about how to use", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "GatherConfig", + "Version": "v1", + "Kind": "GenericAPIServerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ImagePolicy": { - "description": "ImagePolicy holds namespace-wide configuration for image signature verification\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.GenericControllerConfig": { + "description": "GenericControllerConfig provides information to configure a controller", "type": "object", "required": [ - "spec" + "servingInfo", + "leaderElection", + "authentication", + "authorization" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "authentication": { + "description": "authentication allows configuration of authentication for the endpoints", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DelegatedAuthentication" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "authorization": { + "description": "authorization allows configuration of authentication for the endpoints", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.v1.DelegatedAuthorization" }, - "spec": { - "description": "spec holds user settable values for configuration", + "leaderElection": { + "description": "leaderElection provides information to elect a leader. Only override this if you have a specific need", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.ImagePolicySpec" + "$ref": "#/definitions/io.openshift.config.v1.LeaderElection" }, - "status": { - "description": "status contains the observed state of the resource.", + "servingInfo": { + "description": "ServingInfo is the HTTP serving information for the controller's endpoints", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.ImagePolicyStatus" + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ImagePolicy", + "Version": "v1", + "Kind": "GenericControllerConfig", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ImagePolicyList": { - "description": "ImagePolicyList is a list of ImagePolicy resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.GitHubIdentityProvider": { + "description": "GitHubIdentityProvider provides identities for users authenticating using GitHub credentials", "type": "object", "required": [ - "metadata", - "items" + "clientID", + "clientSecret" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. This can only be configured when hostname is set to a non-empty value. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "items": { + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" + }, + "clientSecret": { + "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "hostname": { + "description": "hostname is the optional domain (e.g. \"mycompany.com\") for use with a hosted instance of GitHub Enterprise. It must match the GitHub Enterprise settings value configured at /setup/settings#hostname.", + "type": "string", + "default": "" + }, + "organizations": { + "description": "organizations optionally restricts which organizations are allowed to log in", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.ImagePolicy" + "type": "string", + "default": "" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "teams": { + "description": "teams optionally restricts which teams are allowed to log in. Format is \u003corg\u003e/\u003cteam\u003e.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ImagePolicyList", + "Version": "v1", + "Kind": "GitHubIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ImagePolicySpec": { - "description": "ImagePolicySpec is the specification of the ImagePolicy CRD.", + "io.openshift.config.v1.GitLabIdentityProvider": { + "description": "GitLabIdentityProvider provides identities for users authenticating using GitLab credentials", "type": "object", "required": [ - "scopes", - "policy" + "clientID", + "clientSecret", + "url" ], "properties": { - "policy": { - "description": "policy contains configuration to allow scopes to be verified, and defines how images not matching the verification policy will be treated.", + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.Policy" + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "scopes": { - "description": "scopes defines the list of image identities assigned to a policy. Each item refers to a scope in a registry implementing the \"Docker Registry HTTP API V2\". Scopes matching individual images are named Docker references in the fully expanded form, either using a tag or digest. For example, docker.io/library/busybox:latest (not busybox:latest). More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest), a repository namespace, or a registry host (by only specifying the host name and possibly a port number) or a wildcard expression starting with `*.`, for matching all subdomains (not including a port number). Wildcards are only supported for subdomain matching, and may not be used in the middle of the host, i.e. *.example.com is a valid case, but example*.*.com is not. If multiple scopes match a given image, only the policy requirements for the most specific scope apply. The policy requirements for more general scopes are ignored. In addition to setting a policy appropriate for your own deployed applications, make sure that a policy on the OpenShift image repositories quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev (or on a more general scope) allows deployment of the OpenShift images required for cluster operation. For additional details about the format, please refer to the document explaining the docker transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" + }, + "clientSecret": { + "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "url": { + "description": "url is the oauth server base URL", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ImagePolicySpec", + "Version": "v1", + "Kind": "GitLabIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.ImagePolicyStatus": { + "io.openshift.config.v1.GoogleIdentityProvider": { + "description": "GoogleIdentityProvider provides identities for users authenticating using Google credentials", "type": "object", + "required": [ + "clientID", + "clientSecret" + ], "properties": { - "conditions": { - "description": "conditions provide details on the status of this API Resource.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" + }, + "clientSecret": { + "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "hostedDomain": { + "description": "hostedDomain is the optional Google App domain (e.g. \"mycompany.com\") to restrict logins to", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "ImagePolicyStatus", + "Version": "v1", + "Kind": "GoogleIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.InsightsDataGather": { - "description": "InsightsDataGather provides data gather configuration options for the the Insights Operator.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.HTPasswdIdentityProvider": { + "description": "HTPasswdPasswordIdentityProvider provides identities for users authenticating using htpasswd credentials", "type": "object", "required": [ - "spec" + "fileData" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.InsightsDataGatherSpec" - }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", + "fileData": { + "description": "fileData is a required reference to a secret by name containing the data to use as the htpasswd file. The key \"htpasswd\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. If the specified htpasswd data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.InsightsDataGatherStatus" + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "InsightsDataGather", - "Scope": "Clustered" + "Version": "v1", + "Kind": "HTPasswdIdentityProvider", + "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.InsightsDataGatherList": { - "description": "InsightsDataGatherList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.HTTPServingInfo": { + "description": "HTTPServingInfo holds configuration for serving HTTP", "type": "object", "required": [ - "metadata", - "items" + "bindAddress", + "bindNetwork", + "certFile", + "keyFile", + "maxRequestsInFlight", + "requestTimeoutSeconds" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "bindAddress": { + "description": "BindAddress is the ip:port to serve on", + "type": "string", + "default": "" + }, + "bindNetwork": { + "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", + "type": "string", + "default": "" + }, + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", + "type": "string", + "default": "" + }, + "cipherSuites": { + "description": "CipherSuites contains an overridden list of ciphers for the server to support. Values must match cipher suite IDs from https://golang.org/pkg/crypto/tls/#pkg-constants", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "clientCA": { + "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", "type": "string" }, - "items": { + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" + }, + "maxRequestsInFlight": { + "description": "MaxRequestsInFlight is the number of concurrent requests allowed to the server. If zero, no limit.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "minTLSVersion": { + "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", + "type": "string" + }, + "namedCertificates": { + "description": "NamedCertificates is a list of certificates to use to secure requests to specific hostnames", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.InsightsDataGather" + "$ref": "#/definitions/io.openshift.config.v1.NamedCertificate" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "requestTimeoutSeconds": { + "description": "RequestTimeoutSeconds is the number of seconds before requests are timed out. The default is 60 minutes, if -1 there is no limit on requests.", + "type": "integer", + "format": "int64", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "HTTPServingInfo", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.HubSource": { + "description": "HubSource is used to specify the hub source and its configuration", + "type": "object", + "required": [ + "name", + "disabled" + ], + "properties": { + "disabled": { + "description": "disabled is used to disable a default hub source on cluster", + "type": "boolean", + "default": false }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "name": { + "description": "name is the name of one of the default hub sources", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "InsightsDataGatherList", + "Version": "v1", + "Kind": "HubSource", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.InsightsDataGatherSpec": { + "io.openshift.config.v1.HubSourceStatus": { + "description": "HubSourceStatus is used to reflect the current state of applying the configuration to a default source", "type": "object", "properties": { - "gatherConfig": { - "description": "gatherConfig spec attribute includes all the configuration options related to gathering of the Insights data and its uploading to the ingress.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.GatherConfig" + "message": { + "description": "message provides more information regarding failures", + "type": "string" + }, + "status": { + "description": "status indicates success or failure in applying the configuration", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "InsightsDataGatherSpec", + "Version": "v1", + "Kind": "HubSourceStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.InsightsDataGatherStatus": { + "io.openshift.config.v1.IBMCloudPlatformSpec": { + "description": "IBMCloudPlatformSpec holds the desired state of the IBMCloud infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "InsightsDataGatherStatus", + "Version": "v1", + "Kind": "IBMCloudPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.Policy": { - "description": "Policy defines the verification policy for the items in the scopes list.", + "io.openshift.config.v1.IBMCloudPlatformStatus": { + "description": "IBMCloudPlatformStatus holds the current status of the IBMCloud infrastructure provider.", "type": "object", - "required": [ - "rootOfTrust" - ], "properties": { - "rootOfTrust": { - "description": "rootOfTrust specifies the root of trust for the policy.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyRootOfTrust" + "cisInstanceCRN": { + "description": "CISInstanceCRN is the CRN of the Cloud Internet Services instance managing the DNS zone for the cluster's base domain", + "type": "string" }, - "signedIdentity": { - "description": "signedIdentity specifies what image identity the signature claims about the image. The required matchPolicy field specifies the approach used in the verification process to verify the identity in the signature and the actual image identity, the default matchPolicy is \"MatchRepoDigestOrExact\".", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyIdentity" + "dnsInstanceCRN": { + "description": "DNSInstanceCRN is the CRN of the DNS Services instance managing the DNS zone for the cluster's base domain", + "type": "string" + }, + "location": { + "description": "Location is where the cluster has been deployed", + "type": "string" + }, + "providerType": { + "description": "ProviderType indicates the type of cluster that was created", + "type": "string" + }, + "resourceGroupName": { + "description": "ResourceGroupName is the Resource Group for new IBMCloud resources created for the cluster.", + "type": "string" + }, + "serviceEndpoints": { + "description": "serviceEndpoints is a list of custom endpoints which will override the default service endpoints of an IBM Cloud service. These endpoints are consumed by components within the cluster to reach the respective IBM Cloud Services.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.IBMCloudServiceEndpoint" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "Policy", + "Version": "v1", + "Kind": "IBMCloudPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.PolicyFulcioSubject": { - "description": "PolicyFulcioSubject defines the OIDC issuer and the email of the Fulcio authentication configuration.", + "io.openshift.config.v1.IBMCloudServiceEndpoint": { + "description": "IBMCloudServiceEndpoint stores the configuration of a custom url to override existing defaults of IBM Cloud Services.", "type": "object", "required": [ - "oidcIssuer", - "signedEmail" + "name", + "url" ], "properties": { - "oidcIssuer": { - "description": "oidcIssuer contains the expected OIDC issuer. It will be verified that the Fulcio-issued certificate contains a (Fulcio-defined) certificate extension pointing at this OIDC issuer URL. When Fulcio issues certificates, it includes a value based on an URL inside the client-provided ID token. Example: \"https://expected.OIDC.issuer/\"", + "name": { + "description": "name is the name of the IBM Cloud service. Possible values are: CIS, COS, COSConfig, DNSServices, GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC. For example, the IBM Cloud Private IAM service could be configured with the service `name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com` Whereas the IBM Cloud Private VPC service for US South (Dallas) could be configured with the service `name` of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`", "type": "string", "default": "" }, - "signedEmail": { - "description": "signedEmail holds the email address the the Fulcio certificate is issued for. Example: \"expected-signing-user@example.com\"", + "url": { + "description": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", "type": "string", "default": "" } @@ -26064,83 +26869,66 @@ "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "PolicyFulcioSubject", + "Version": "v1", + "Kind": "IBMCloudServiceEndpoint", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.PolicyIdentity": { - "description": "PolicyIdentity defines image identity the signature claims about the image. When omitted, the default matchPolicy is \"MatchRepoDigestOrExact\".", + "io.openshift.config.v1.IdentityProvider": { + "description": "IdentityProvider provides identities for users authenticating using credentials", "type": "object", "required": [ - "matchPolicy" + "name", + "type" ], "properties": { - "exactRepository": { - "description": "exactRepository is required if matchPolicy is set to \"ExactRepository\".", - "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyMatchExactRepository" + "basicAuth": { + "description": "basicAuth contains configuration options for the BasicAuth IdP", + "$ref": "#/definitions/io.openshift.config.v1.BasicAuthIdentityProvider" }, - "matchPolicy": { - "description": "matchPolicy sets the type of matching to be used. Valid values are \"MatchRepoDigestOrExact\", \"MatchRepository\", \"ExactRepository\", \"RemapIdentity\". When omitted, the default value is \"MatchRepoDigestOrExact\". If set matchPolicy to ExactRepository, then the exactRepository must be specified. If set matchPolicy to RemapIdentity, then the remapIdentity must be specified. \"MatchRepoDigestOrExact\" means that the identity in the signature must be in the same repository as the image identity if the image identity is referenced by a digest. Otherwise, the identity in the signature must be the same as the image identity. \"MatchRepository\" means that the identity in the signature must be in the same repository as the image identity. \"ExactRepository\" means that the identity in the signature must be in the same repository as a specific identity specified by \"repository\". \"RemapIdentity\" means that the signature must be in the same as the remapped image identity. Remapped image identity is obtained by replacing the \"prefix\" with the specified “signedPrefix” if the the image identity matches the specified remapPrefix.", - "type": "string", - "default": "" + "github": { + "description": "github enables user authentication using GitHub credentials", + "$ref": "#/definitions/io.openshift.config.v1.GitHubIdentityProvider" }, - "remapIdentity": { - "description": "remapIdentity is required if matchPolicy is set to \"RemapIdentity\".", - "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyMatchRemapIdentity" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "PolicyIdentity", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "matchPolicy", - "fields-to-discriminateBy": { - "exactRepository": "PolicyMatchExactRepository", - "remapIdentity": "PolicyMatchRemapIdentity" - } - } - ] - }, - "io.openshift.config.v1alpha1.PolicyMatchExactRepository": { - "type": "object", - "required": [ - "repository" - ], - "properties": { - "repository": { - "description": "repository is the reference of the image identity to be matched. The value should be a repository name (by omitting the tag or digest) in a registry implementing the \"Docker Registry HTTP API V2\". For example, docker.io/library/busybox", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "PolicyMatchExactRepository", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1alpha1.PolicyMatchRemapIdentity": { - "type": "object", - "required": [ - "prefix", - "signedPrefix" - ], - "properties": { - "prefix": { - "description": "prefix is the prefix of the image identity to be matched. If the image identity matches the specified prefix, that prefix is replaced by the specified “signedPrefix” (otherwise it is used as unchanged and no remapping takes place). This useful when verifying signatures for a mirror of some other repository namespace that preserves the vendor’s repository structure. The prefix and signedPrefix values can be either host[:port] values (matching exactly the same host[:port], string), repository namespaces, or repositories (i.e. they must not contain tags/digests), and match as prefixes of the fully expanded form. For example, docker.io/library/busybox (not busybox) to specify that single repository, or docker.io/library (not an empty string) to specify the parent namespace of docker.io/library/busybox.", + "gitlab": { + "description": "gitlab enables user authentication using GitLab credentials", + "$ref": "#/definitions/io.openshift.config.v1.GitLabIdentityProvider" + }, + "google": { + "description": "google enables user authentication using Google credentials", + "$ref": "#/definitions/io.openshift.config.v1.GoogleIdentityProvider" + }, + "htpasswd": { + "description": "htpasswd enables user authentication using an HTPasswd file to validate credentials", + "$ref": "#/definitions/io.openshift.config.v1.HTPasswdIdentityProvider" + }, + "keystone": { + "description": "keystone enables user authentication using keystone password credentials", + "$ref": "#/definitions/io.openshift.config.v1.KeystoneIdentityProvider" + }, + "ldap": { + "description": "ldap enables user authentication using LDAP credentials", + "$ref": "#/definitions/io.openshift.config.v1.LDAPIdentityProvider" + }, + "mappingMethod": { + "description": "mappingMethod determines how identities from this provider are mapped to users Defaults to \"claim\"", + "type": "string" + }, + "name": { + "description": "name is used to qualify the identities returned by this provider. - It MUST be unique and not shared by any other identity provider used - It MUST be a valid path segment: name cannot equal \".\" or \"..\" or contain \"/\" or \"%\" or \":\"\n Ref: https://godoc.org/github.com/openshift/origin/pkg/user/apis/user/validation#ValidateIdentityProviderName", "type": "string", "default": "" }, - "signedPrefix": { - "description": "signedPrefix is the prefix of the image identity to be matched in the signature. The format is the same as \"prefix\". The values can be either host[:port] values (matching exactly the same host[:port], string), repository namespaces, or repositories (i.e. they must not contain tags/digests), and match as prefixes of the fully expanded form. For example, docker.io/library/busybox (not busybox) to specify that single repository, or docker.io/library (not an empty string) to specify the parent namespace of docker.io/library/busybox.", + "openID": { + "description": "openID enables user authentication using OpenID credentials", + "$ref": "#/definitions/io.openshift.config.v1.OpenIDIdentityProvider" + }, + "requestHeader": { + "description": "requestHeader enables user authentication using request header credentials", + "$ref": "#/definitions/io.openshift.config.v1.RequestHeaderIdentityProvider" + }, + "type": { + "description": "type identifies the identity provider type for this entry.", "type": "string", "default": "" } @@ -26148,205 +26936,109 @@ "x-fabric8-info": { "Type": "nested", "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "PolicyMatchRemapIdentity", + "Version": "v1", + "Kind": "IdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.config.v1alpha1.PolicyRootOfTrust": { - "description": "PolicyRootOfTrust defines the root of trust based on the selected policyType.", + "io.openshift.config.v1.IdentityProviderConfig": { + "description": "IdentityProviderConfig contains configuration for using a specific identity provider", "type": "object", "required": [ - "policyType" + "type" ], "properties": { - "fulcioCAWithRekor": { - "description": "fulcioCAWithRekor defines the root of trust based on the Fulcio certificate and the Rekor public key. For more information about Fulcio and Rekor, please refer to the document at: https://github.com/sigstore/fulcio and https://github.com/sigstore/rekor", - "$ref": "#/definitions/io.openshift.config.v1alpha1.FulcioCAWithRekor" + "basicAuth": { + "description": "basicAuth contains configuration options for the BasicAuth IdP", + "$ref": "#/definitions/io.openshift.config.v1.BasicAuthIdentityProvider" }, - "policyType": { - "description": "policyType serves as the union's discriminator. Users are required to assign a value to this field, choosing one of the policy types that define the root of trust. \"PublicKey\" indicates that the policy relies on a sigstore publicKey and may optionally use a Rekor verification. \"FulcioCAWithRekor\" indicates that the policy is based on the Fulcio certification and incorporates a Rekor verification.", - "type": "string", - "default": "" + "github": { + "description": "github enables user authentication using GitHub credentials", + "$ref": "#/definitions/io.openshift.config.v1.GitHubIdentityProvider" }, - "publicKey": { - "description": "publicKey defines the root of trust based on a sigstore public key.", - "$ref": "#/definitions/io.openshift.config.v1alpha1.PublicKey" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "PolicyRootOfTrust", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "policyType", - "fields-to-discriminateBy": { - "fulcioCAWithRekor": "FulcioCAWithRekor", - "publicKey": "PublicKey" - } - } - ] - }, - "io.openshift.config.v1alpha1.PublicKey": { - "description": "PublicKey defines the root of trust based on a sigstore public key.", - "type": "object", - "required": [ - "keyData" - ], - "properties": { - "keyData": { - "description": "keyData contains inline base64-encoded data for the PEM format public key. KeyData must be at most 8192 characters.", - "type": "string", - "format": "byte" + "gitlab": { + "description": "gitlab enables user authentication using GitLab credentials", + "$ref": "#/definitions/io.openshift.config.v1.GitLabIdentityProvider" }, - "rekorKeyData": { - "description": "rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key. rekorKeyData must be at most 8192 characters.", - "type": "string", - "format": "byte" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "PublicKey", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1alpha1.RetentionNumberConfig": { - "description": "RetentionNumberConfig specifies the configuration of the retention policy on the number of backups", - "type": "object", - "properties": { - "maxNumberOfBackups": { - "description": "MaxNumberOfBackups defines the maximum number of backups to retain. If the existing number of backups saved is equal to MaxNumberOfBackups then the oldest backup will be removed before a new backup is initiated.", - "type": "integer", - "format": "int32" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "RetentionNumberConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.config.v1alpha1.RetentionPolicy": { - "description": "RetentionPolicy defines the retention policy for retaining and deleting existing backups. This struct is a discriminated union that allows users to select the type of retention policy from the supported types.", - "type": "object", - "required": [ - "retentionType" - ], - "properties": { - "retentionNumber": { - "description": "RetentionNumber configures the retention policy based on the number of backups", - "$ref": "#/definitions/io.openshift.config.v1alpha1.RetentionNumberConfig" + "google": { + "description": "google enables user authentication using Google credentials", + "$ref": "#/definitions/io.openshift.config.v1.GoogleIdentityProvider" }, - "retentionSize": { - "description": "RetentionSize configures the retention policy based on the size of backups", - "$ref": "#/definitions/io.openshift.config.v1alpha1.RetentionSizeConfig" + "htpasswd": { + "description": "htpasswd enables user authentication using an HTPasswd file to validate credentials", + "$ref": "#/definitions/io.openshift.config.v1.HTPasswdIdentityProvider" }, - "retentionType": { - "description": "RetentionType sets the type of retention policy. Currently, the only valid policies are retention by number of backups (RetentionNumber), by the size of backups (RetentionSize). More policies or types may be added in the future. Empty string means no opinion and the platform is left to choose a reasonable default which is subject to change without notice. The current default is RetentionNumber with 15 backups kept.\n\nPossible enum values:\n - `\"RetentionNumber\"` sets the retention policy based on the number of backup files saved\n - `\"RetentionSize\"` sets the retention policy based on the total size of the backup files saved", - "type": "string", - "default": "", - "enum": [ - "RetentionNumber", - "RetentionSize" - ] - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "RetentionPolicy", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "retentionType", - "fields-to-discriminateBy": { - "retentionNumber": "RetentionNumber", - "retentionSize": "RetentionSize" - } - } - ] - }, - "io.openshift.config.v1alpha1.RetentionSizeConfig": { - "description": "RetentionSizeConfig specifies the configuration of the retention policy on the total size of backups", - "type": "object", - "properties": { - "maxSizeOfBackupsGb": { - "description": "MaxSizeOfBackupsGb defines the total size in GB of backups to retain. If the current total size backups exceeds MaxSizeOfBackupsGb then the oldest backup will be removed before a new backup is initiated.", - "type": "integer", - "format": "int32" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "config.openshift.io", - "Version": "v1alpha1", - "Kind": "RetentionSizeConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.console.v1.ApplicationMenuSpec": { - "description": "ApplicationMenuSpec is the specification of the desired section and icon used for the link in the application menu.", - "type": "object", - "required": [ - "section" - ], - "properties": { - "imageURL": { - "description": "imageUrl is the URL for the icon used in front of the link in the application menu. The URL must be an HTTPS URL or a Data URI. The image should be square and will be shown at 24x24 pixels.", - "type": "string" + "keystone": { + "description": "keystone enables user authentication using keystone password credentials", + "$ref": "#/definitions/io.openshift.config.v1.KeystoneIdentityProvider" }, - "section": { - "description": "section is the section of the application menu in which the link should appear. This can be any text that will appear as a subheading in the application menu dropdown. A new section will be created if the text does not match text of an existing section.", + "ldap": { + "description": "ldap enables user authentication using LDAP credentials", + "$ref": "#/definitions/io.openshift.config.v1.LDAPIdentityProvider" + }, + "openID": { + "description": "openID enables user authentication using OpenID credentials", + "$ref": "#/definitions/io.openshift.config.v1.OpenIDIdentityProvider" + }, + "requestHeader": { + "description": "requestHeader enables user authentication using request header credentials", + "$ref": "#/definitions/io.openshift.config.v1.RequestHeaderIdentityProvider" + }, + "type": { + "description": "type identifies the identity provider type for this entry.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ApplicationMenuSpec", + "Kind": "IdentityProviderConfig", "Scope": "Namespaced" } }, - "io.openshift.console.v1.CLIDownloadLink": { + "io.openshift.config.v1.Image": { + "description": "Image governs policies related to imagestream imports and runtime configuration for external registries. It allows cluster admins to configure which registries OpenShift is allowed to import images from, extra CA trust bundles for external registries, and policies to block or allow registry hostnames. When exposing OpenShift's image registry to the public, this also lets cluster admins specify the external hostname.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "href" + "spec" ], "properties": { - "href": { - "description": "href is the absolute secure URL for the link (must use https)", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "text": { - "description": "text is the display text for the link", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "console.openshift.io", + "Type": "object", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "CLIDownloadLink", - "Scope": "Namespaced" + "Kind": "Image", + "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsoleCLIDownload": { - "description": "ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageContentPolicy": { + "description": "ImageContentPolicy holds cluster-wide information about how to handle registry mirror rules. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -26366,20 +27058,21 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleCLIDownloadSpec" + "$ref": "#/definitions/io.openshift.config.v1.ImageContentPolicySpec" } }, "x-fabric8-info": { "Type": "object", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleCLIDownload", + "Kind": "ImageContentPolicy", "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsoleCLIDownloadList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageContentPolicyList": { + "description": "ImageContentPolicyList lists the items in the ImageContentPolicy CRD.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -26394,7 +27087,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleCLIDownload" + "$ref": "#/definitions/io.openshift.config.v1.ImageContentPolicy" } }, "kind": { @@ -26409,50 +27102,39 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleCLIDownloadList", + "Kind": "ImageContentPolicyList", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleCLIDownloadSpec": { - "description": "ConsoleCLIDownloadSpec is the desired cli download configuration.", + "io.openshift.config.v1.ImageContentPolicySpec": { + "description": "ImageContentPolicySpec is the specification of the ImageContentPolicy CRD.", "type": "object", - "required": [ - "displayName", - "description", - "links" - ], "properties": { - "description": { - "description": "description is the description of the CLI download (can include markdown).", - "type": "string", - "default": "" - }, - "displayName": { - "description": "displayName is the display name of the CLI download.", - "type": "string", - "default": "" - }, - "links": { - "description": "links is a list of objects that provide CLI download link details.", + "repositoryDigestMirrors": { + "description": "repositoryDigestMirrors allows images referenced by image digests in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in RepositoryDigestMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. To pull image from mirrors by tags, should set the \"allowMirrorByTags\".\n\nEach “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nIf the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.CLIDownloadLink" - } + "$ref": "#/definitions/io.openshift.config.v1.RepositoryDigestMirrors" + }, + "x-kubernetes-list-map-keys": [ + "source" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleCLIDownloadSpec", + "Kind": "ImageContentPolicySpec", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleExternalLogLink": { - "description": "ConsoleExternalLogLink is an extension for customizing OpenShift web console log links.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageDigestMirrorSet": { + "description": "ImageDigestMirrorSet holds cluster-wide information about how to handle registry mirror rules on using digest pull specification. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -26472,20 +27154,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleExternalLogLinkSpec" + "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrorSetSpec" + }, + "status": { + "description": "status contains the observed state of the resource.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrorSetStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleExternalLogLink", + "Kind": "ImageDigestMirrorSet", "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsoleExternalLogLinkList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageDigestMirrorSetList": { + "description": "ImageDigestMirrorSetList lists the items in the ImageDigestMirrorSet CRD.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -26500,7 +27188,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleExternalLogLink" + "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrorSet" } }, "kind": { @@ -26515,78 +27203,104 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleExternalLogLinkList", + "Kind": "ImageDigestMirrorSetList", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleExternalLogLinkSpec": { - "description": "ConsoleExternalLogLinkSpec is the desired log link configuration. The log link will appear on the logs tab of the pod details page.", + "io.openshift.config.v1.ImageDigestMirrorSetSpec": { + "description": "ImageDigestMirrorSetSpec is the specification of the ImageDigestMirrorSet CRD.", + "type": "object", + "properties": { + "imageDigestMirrors": { + "description": "imageDigestMirrors allows images referenced by image digests in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in imageDigestMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. To use mirrors to pull images using tag specification, users should configure a list of mirrors using \"ImageTagMirrorSet\" CRD.\n\nIf the image pull specification matches the repository of \"source\" in multiple imagedigestmirrorset objects, only the objects which define the most specific namespace match will be used. For example, if there are objects using quay.io/libpod and quay.io/libpod/busybox as the \"source\", only the objects using quay.io/libpod/busybox are going to apply for pull specification quay.io/libpod/busybox. Each “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nIf the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified. Users who want to use a specific order of mirrors, should configure them into one list of mirrors using the expected order.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageDigestMirrors" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ImageDigestMirrorSetSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ImageDigestMirrorSetStatus": { + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ImageDigestMirrorSetStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ImageDigestMirrors": { + "description": "ImageDigestMirrors holds cluster-wide information about how to handle mirrors in the registries config.", "type": "object", "required": [ - "text", - "hrefTemplate" + "source" ], "properties": { - "hrefTemplate": { - "description": "hrefTemplate is an absolute secure URL (must use https) for the log link including variables to be replaced. Variables are specified in the URL with the format ${variableName}, for instance, ${containerName} and will be replaced with the corresponding values from the resource. Resource is a pod. Supported variables are: - ${resourceName} - name of the resource which containes the logs - ${resourceUID} - UID of the resource which contains the logs\n - e.g. `11111111-2222-3333-4444-555555555555`\n- ${containerName} - name of the resource's container that contains the logs - ${resourceNamespace} - namespace of the resource that contains the logs - ${resourceNamespaceUID} - namespace UID of the resource that contains the logs - ${podLabels} - JSON representation of labels matching the pod with the logs\n - e.g. `{\"key1\":\"value1\",\"key2\":\"value2\"}`\n\ne.g., https://example.com/logs?resourceName=${resourceName}\u0026containerName=${containerName}\u0026resourceNamespace=${resourceNamespace}\u0026podLabels=${podLabels}", - "type": "string", - "default": "" - }, - "namespaceFilter": { - "description": "namespaceFilter is a regular expression used to restrict a log link to a matching set of namespaces (e.g., `^openshift-`). The string is converted into a regular expression using the JavaScript RegExp constructor. If not specified, links will be displayed for all the namespaces.", + "mirrorSourcePolicy": { + "description": "mirrorSourcePolicy defines the fallback policy if fails to pull image from the mirrors. If unset, the image will continue to be pulled from the the repository in the pull spec. sourcePolicy is valid configuration only when one or more mirrors are in the mirror list.", "type": "string" }, - "text": { - "description": "text is the display text for the link", + "mirrors": { + "description": "mirrors is zero or more locations that may also contain the same images. No mirror will be configured if not specified. Images can be pulled from these mirrors only if they are referenced by their digests. The mirrored location is obtained by replacing the part of the input reference that matches source by the mirrors entry, e.g. for registry.redhat.io/product/repo reference, a (source, mirror) pair *.redhat.io, mirror.local/redhat causes a mirror.local/redhat/product/repo repository to be used. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. If no mirror is specified or all image pulls from the mirror list fail, the image will continue to be pulled from the repository in the pull spec unless explicitly prohibited by \"mirrorSourcePolicy\" Other cluster configuration, including (but not limited to) other imageDigestMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering. \"mirrors\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, + "source": { + "description": "source matches the repository that users refer to, e.g. in image pull specifications. Setting source to a registry hostname e.g. docker.io. quay.io, or registry.redhat.io, will match the image pull specification of corressponding registry. \"source\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo [*.]host for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleExternalLogLinkSpec", + "Kind": "ImageDigestMirrors", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleLink": { - "description": "ConsoleLink is an extension for customizing OpenShift web console links.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageLabel": { "type": "object", "required": [ - "spec" + "name" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "name": { + "description": "Name defines the name of the label. It must have non-zero length.", + "type": "string", + "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "value": { + "description": "Value defines the literal value of the label.", "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleLinkSpec" } }, "x-fabric8-info": { - "Type": "object", - "Group": "console.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleLink", - "Scope": "Clustered" + "Kind": "ImageLabel", + "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleLinkList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -26601,7 +27315,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleLink" + "$ref": "#/definitions/io.openshift.config.v1.Image" } }, "kind": { @@ -26616,55 +27330,96 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleLinkList", + "Kind": "ImageList", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleLinkSpec": { - "description": "ConsoleLinkSpec is the desired console link configuration.", + "io.openshift.config.v1.ImageSpec": { "type": "object", - "required": [ - "text", - "href", - "location" - ], "properties": { - "applicationMenu": { - "description": "applicationMenu holds information about section and icon used for the link in the application menu, and it is applicable only when location is set to ApplicationMenu.", - "$ref": "#/definitions/io.openshift.console.v1.ApplicationMenuSpec" - }, - "href": { - "description": "href is the absolute secure URL for the link (must use https)", - "type": "string", - "default": "" + "additionalTrustedCA": { + "description": "additionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted during imagestream import, pod image pull, build image pull, and imageregistry pullthrough. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "location": { - "description": "location determines which location in the console the link will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).", + "allowedRegistriesForImport": { + "description": "allowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.RegistryLocation" + }, + "x-kubernetes-list-type": "atomic" + }, + "externalRegistryHostnames": { + "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "imageStreamImportMode": { + "description": "imageStreamImportMode controls the import mode behaviour of imagestreams. It can be set to `Legacy` or `PreserveOriginal` or the empty string. If this value is specified, this setting is applied to all newly created imagestreams which do not have the value set. `Legacy` indicates that the legacy behaviour should be used. For manifest lists, the legacy behaviour will discard the manifest list and import a single sub-manifest. In this case, the platform is chosen in the following order of priority: 1. tag annotations; 2. control plane arch/os; 3. linux/amd64; 4. the first manifest in the list. `PreserveOriginal` indicates that the original manifest will be preserved. For manifest lists, the manifest list and all its sub-manifests will be imported. When empty, the behaviour will be decided based on the payload type advertised by the ClusterVersion status, i.e single arch payload implies the import mode is Legacy and multi payload implies PreserveOriginal.\n\nPossible enum values:\n - `\"Legacy\"` indicates that the legacy behaviour should be used. For manifest lists, the legacy behaviour will discard the manifest list and import a single sub-manifest. In this case, the platform is chosen in the following order of priority: 1. tag annotations; 2. control plane arch/os; 3. linux/amd64; 4. the first manifest in the list. This mode is the default.\n - `\"PreserveOriginal\"` indicates that the original manifest will be preserved. For manifest lists, the manifest list and all its sub-manifests will be imported.", "type": "string", - "default": "" + "default": "", + "enum": [ + "Legacy", + "PreserveOriginal" + ] }, - "namespaceDashboard": { - "description": "namespaceDashboard holds information about namespaces in which the dashboard link should appear, and it is applicable only when location is set to NamespaceDashboard. If not specified, the link will appear in all namespaces.", - "$ref": "#/definitions/io.openshift.console.v1.NamespaceDashboardSpec" + "registrySources": { + "description": "registrySources contains configuration that determines how the container runtime should treat individual registries when accessing images for builds+pods. (e.g. whether or not to allow insecure access). It does not contain configuration for the internal cluster registry.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.RegistrySources" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ImageSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ImageStatus": { + "type": "object", + "properties": { + "externalRegistryHostnames": { + "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "text": { - "description": "text is the display text for the link", + "imageStreamImportMode": { + "description": "imageStreamImportMode controls the import mode behaviour of imagestreams. It can be `Legacy` or `PreserveOriginal`. `Legacy` indicates that the legacy behaviour should be used. For manifest lists, the legacy behaviour will discard the manifest list and import a single sub-manifest. In this case, the platform is chosen in the following order of priority: 1. tag annotations; 2. control plane arch/os; 3. linux/amd64; 4. the first manifest in the list. `PreserveOriginal` indicates that the original manifest will be preserved. For manifest lists, the manifest list and all its sub-manifests will be imported. This value will be reconciled based on either the spec value or if no spec value is specified, the image registry operator would look at the ClusterVersion status to determine the payload type and set the import mode accordingly, i.e single arch payload implies the import mode is Legacy and multi payload implies PreserveOriginal.\n\nPossible enum values:\n - `\"Legacy\"` indicates that the legacy behaviour should be used. For manifest lists, the legacy behaviour will discard the manifest list and import a single sub-manifest. In this case, the platform is chosen in the following order of priority: 1. tag annotations; 2. control plane arch/os; 3. linux/amd64; 4. the first manifest in the list. This mode is the default.\n - `\"PreserveOriginal\"` indicates that the original manifest will be preserved. For manifest lists, the manifest list and all its sub-manifests will be imported.", "type": "string", - "default": "" + "enum": [ + "Legacy", + "PreserveOriginal" + ] + }, + "internalRegistryHostname": { + "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. This value is set by the image registry operator which controls the internal registry hostname.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleLinkSpec", + "Kind": "ImageStatus", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleNotification": { - "description": "ConsoleNotification is the extension for configuring openshift web console notifications.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageTagMirrorSet": { + "description": "ImageTagMirrorSet holds cluster-wide information about how to handle registry mirror rules on using tag pull specification. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -26684,20 +27439,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleNotificationSpec" + "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrorSetSpec" + }, + "status": { + "description": "status contains the observed state of the resource.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrorSetStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleNotification", + "Kind": "ImageTagMirrorSet", "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsoleNotificationList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ImageTagMirrorSetList": { + "description": "ImageTagMirrorSetList lists the items in the ImageTagMirrorSet CRD.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -26712,7 +27473,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleNotification" + "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrorSet" } }, "kind": { @@ -26727,54 +27488,82 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleNotificationList", + "Kind": "ImageTagMirrorSetList", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleNotificationSpec": { - "description": "ConsoleNotificationSpec is the desired console notification configuration.", + "io.openshift.config.v1.ImageTagMirrorSetSpec": { + "description": "ImageTagMirrorSetSpec is the specification of the ImageTagMirrorSet CRD.", + "type": "object", + "properties": { + "imageTagMirrors": { + "description": "imageTagMirrors allows images referenced by image tags in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in imageTagMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. To use mirrors to pull images using digest specification only, users should configure a list of mirrors using \"ImageDigestMirrorSet\" CRD.\n\nIf the image pull specification matches the repository of \"source\" in multiple imagetagmirrorset objects, only the objects which define the most specific namespace match will be used. For example, if there are objects using quay.io/libpod and quay.io/libpod/busybox as the \"source\", only the objects using quay.io/libpod/busybox are going to apply for pull specification quay.io/libpod/busybox. Each “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nIf the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified. Users who want to use a deterministic order of mirrors, should configure them into one list of mirrors using the expected order.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ImageTagMirrors" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ImageTagMirrorSetSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ImageTagMirrorSetStatus": { + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ImageTagMirrorSetStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ImageTagMirrors": { + "description": "ImageTagMirrors holds cluster-wide information about how to handle mirrors in the registries config.", "type": "object", "required": [ - "text" + "source" ], "properties": { - "backgroundColor": { - "description": "backgroundColor is the color of the background for the notification as CSS data type color.", - "type": "string" - }, - "color": { - "description": "color is the color of the text for the notification as CSS data type color.", + "mirrorSourcePolicy": { + "description": "mirrorSourcePolicy defines the fallback policy if fails to pull image from the mirrors. If unset, the image will continue to be pulled from the repository in the pull spec. sourcePolicy is valid configuration only when one or more mirrors are in the mirror list.", "type": "string" }, - "link": { - "description": "link is an object that holds notification link details.", - "$ref": "#/definitions/io.openshift.console.v1.Link" - }, - "location": { - "description": "location is the location of the notification in the console. Valid values are: \"BannerTop\", \"BannerBottom\", \"BannerTopBottom\".", - "type": "string" + "mirrors": { + "description": "mirrors is zero or more locations that may also contain the same images. No mirror will be configured if not specified. Images can be pulled from these mirrors only if they are referenced by their tags. The mirrored location is obtained by replacing the part of the input reference that matches source by the mirrors entry, e.g. for registry.redhat.io/product/repo reference, a (source, mirror) pair *.redhat.io, mirror.local/redhat causes a mirror.local/redhat/product/repo repository to be used. Pulling images by tag can potentially yield different images, depending on which endpoint we pull from. Configuring a list of mirrors using \"ImageDigestMirrorSet\" CRD and forcing digest-pulls for mirrors avoids that issue. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. If no mirror is specified or all image pulls from the mirror list fail, the image will continue to be pulled from the repository in the pull spec unless explicitly prohibited by \"mirrorSourcePolicy\". Other cluster configuration, including (but not limited to) other imageTagMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering. \"mirrors\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "text": { - "description": "text is the visible text of the notification.", + "source": { + "description": "source matches the repository that users refer to, e.g. in image pull specifications. Setting source to a registry hostname e.g. docker.io. quay.io, or registry.redhat.io, will match the image pull specification of corressponding registry. \"source\" uses one of the following formats: host[:port] host[:port]/namespace[/namespace…] host[:port]/namespace[/namespace…]/repo [*.]host for more information about the format, see the document about the location field: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md#choosing-a-registry-toml-table", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleNotificationSpec", + "Kind": "ImageTagMirrors", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsolePlugin": { - "description": "ConsolePlugin is an extension for customizing OpenShift web console by dynamically loading code from another service running on the cluster.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.Infrastructure": { + "description": "Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "spec" ], "properties": { @@ -26792,74 +27581,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginSpec" + "$ref": "#/definitions/io.openshift.config.v1.InfrastructureSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.InfrastructureStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsolePlugin", + "Kind": "Infrastructure", "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsolePluginBackend": { - "description": "ConsolePluginBackend holds information about the endpoint which serves the console's plugin", - "type": "object", - "required": [ - "type" - ], - "properties": { - "service": { - "description": "service is a Kubernetes Service that exposes the plugin using a deployment with an HTTP server. The Service must use HTTPS and Service serving certificate. The console backend will proxy the plugins assets from the Service using the service CA bundle.", - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginService" - }, - "type": { - "description": "type is the backend type which servers the console's plugin. Currently only \"Service\" is supported.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsolePluginBackend", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "service": "Service" - } - } - ] - }, - "io.openshift.console.v1.ConsolePluginI18n": { - "description": "ConsolePluginI18n holds information on localization resources that are served by the dynamic plugin.", - "type": "object", - "required": [ - "loadType" - ], - "properties": { - "loadType": { - "description": "loadType indicates how the plugin's localization resource should be loaded. Valid values are Preload, Lazy and the empty string. When set to Preload, all localization resources are fetched when the plugin is loaded. When set to Lazy, localization resources are lazily loaded as and when they are required by the console. When omitted or set to the empty string, the behaviour is equivalent to Lazy type.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsolePluginI18n", - "Scope": "Namespaced" - } - }, - "io.openshift.console.v1.ConsolePluginList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.InfrastructureList": { + "description": "InfrastructureList is\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -26874,7 +27615,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsolePlugin" + "$ref": "#/definitions/io.openshift.config.v1.Infrastructure" } }, "kind": { @@ -26889,195 +27630,101 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsolePluginList", + "Kind": "InfrastructureList", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsolePluginProxy": { - "description": "ConsolePluginProxy holds information on various service types to which console's backend will proxy the plugin's requests.", + "io.openshift.config.v1.InfrastructureSpec": { + "description": "InfrastructureSpec contains settings that apply to the cluster infrastructure.", "type": "object", - "required": [ - "endpoint", - "alias" - ], "properties": { - "alias": { - "description": "alias is a proxy name that identifies the plugin's proxy. An alias name should be unique per plugin. The console backend exposes following proxy endpoint:\n\n/api/proxy/plugin/\u003cplugin-name\u003e/\u003cproxy-alias\u003e/\u003crequest-path\u003e?\u003coptional-query-parameters\u003e\n\nRequest example path:\n\n/api/proxy/plugin/acm/search/pods?namespace=openshift-apiserver", - "type": "string", - "default": "" - }, - "authorization": { - "description": "authorization provides information about authorization type, which the proxied request should contain", - "type": "string" - }, - "caCertificate": { - "description": "caCertificate provides the cert authority certificate contents, in case the proxied Service is using custom service CA. By default, the service CA bundle provided by the service-ca operator is used.", - "type": "string" + "cloudConfig": { + "description": "cloudConfig is a reference to a ConfigMap containing the cloud provider configuration file. This configuration file is used to configure the Kubernetes cloud provider integration when using the built-in cloud provider integration or the external cloud controller manager. The namespace for this config map is openshift-config.\n\ncloudConfig should only be consumed by the kube_cloud_config controller. The controller is responsible for using the user configuration in the spec for various platforms and combining that with the user provided ConfigMap in this field to create a stitched kube cloud config. The controller generates a ConfigMap `kube-cloud-config` in `openshift-config-managed` namespace with the kube cloud config is stored in `cloud.conf` key. All the clients are expected to use the generated ConfigMap only.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapFileReference" }, - "endpoint": { - "description": "endpoint provides information about endpoint to which the request is proxied to.", + "platformSpec": { + "description": "platformSpec holds desired information specific to the underlying infrastructure provider.", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginProxyEndpoint" + "$ref": "#/definitions/io.openshift.config.v1.PlatformSpec" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsolePluginProxy", + "Kind": "InfrastructureSpec", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsolePluginProxyEndpoint": { - "description": "ConsolePluginProxyEndpoint holds information about the endpoint to which request will be proxied to.", + "io.openshift.config.v1.InfrastructureStatus": { + "description": "InfrastructureStatus describes the infrastructure the cluster is leveraging.", "type": "object", "required": [ - "type" + "infrastructureName", + "etcdDiscoveryDomain", + "apiServerURL", + "apiServerInternalURI", + "controlPlaneTopology", + "infrastructureTopology" ], "properties": { - "service": { - "description": "service is an in-cluster Service that the plugin will connect to. The Service must use HTTPS. The console backend exposes an endpoint in order to proxy communication between the plugin and the Service. Note: service field is required for now, since currently only \"Service\" type is supported.", - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginProxyServiceConfig" - }, - "type": { - "description": "type is the type of the console plugin's proxy. Currently only \"Service\" is supported.", + "apiServerInternalURI": { + "description": "apiServerInternalURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerInternalURL can be used by components like kubelets, to contact the Kubernetes API server using the infrastructure provider rather than Kubernetes networking.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsolePluginProxyEndpoint", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "service": "Service" - } - } - ] - }, - "io.openshift.console.v1.ConsolePluginProxyServiceConfig": { - "description": "ProxyTypeServiceConfig holds information on Service to which console's backend will proxy the plugin's requests.", - "type": "object", - "required": [ - "name", - "namespace", - "port" - ], - "properties": { - "name": { - "description": "name of Service that the plugin needs to connect to.", + }, + "apiServerURL": { + "description": "apiServerURL is a valid URI with scheme 'https', address and optionally a port (defaulting to 443). apiServerURL can be used by components like the web console to tell users where to find the Kubernetes API.", "type": "string", "default": "" }, - "namespace": { - "description": "namespace of Service that the plugin needs to connect to", + "controlPlaneTopology": { + "description": "controlPlaneTopology expresses the expectations for operands that normally run on control nodes. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation The 'External' mode indicates that the control plane is hosted externally to the cluster and that its components are not visible within the cluster.", "type": "string", "default": "" }, - "port": { - "description": "port on which the Service that the plugin needs to connect to is listening on.", - "type": "integer", - "format": "int32", - "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsolePluginProxyServiceConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.console.v1.ConsolePluginService": { - "description": "ConsolePluginService holds information on Service that is serving console dynamic plugin assets.", - "type": "object", - "required": [ - "name", - "namespace", - "port" - ], - "properties": { - "basePath": { - "description": "basePath is the path to the plugin's assets. The primary asset it the manifest file called `plugin-manifest.json`, which is a JSON document that contains metadata about the plugin and the extensions.", + "cpuPartitioning": { + "description": "cpuPartitioning expresses if CPU partitioning is a currently enabled feature in the cluster. CPU Partitioning means that this cluster can support partitioning workloads to specific CPU Sets. Valid values are \"None\" and \"AllNodes\". When omitted, the default value is \"None\". The default value of \"None\" indicates that no nodes will be setup with CPU partitioning. The \"AllNodes\" value indicates that all nodes have been setup with CPU partitioning, and can then be further configured via the PerformanceProfile API.", "type": "string", - "default": "" + "default": "None" }, - "name": { - "description": "name of Service that is serving the plugin assets.", + "etcdDiscoveryDomain": { + "description": "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery deprecated: as of 4.7, this field is no longer set or honored. It will be removed in a future release.", "type": "string", "default": "" }, - "namespace": { - "description": "namespace of Service that is serving the plugin assets.", + "infrastructureName": { + "description": "infrastructureName uniquely identifies a cluster with a human friendly name. Once set it should not be changed. Must be of max length 27 and must have only alphanumeric or hyphen characters.", "type": "string", "default": "" }, - "port": { - "description": "port on which the Service that is serving the plugin is listening to.", - "type": "integer", - "format": "int32", - "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsolePluginService", - "Scope": "Namespaced" - } - }, - "io.openshift.console.v1.ConsolePluginSpec": { - "description": "ConsolePluginSpec is the desired plugin configuration.", - "type": "object", - "required": [ - "displayName", - "backend" - ], - "properties": { - "backend": { - "description": "backend holds the configuration of backend which is serving console's plugin .", - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginBackend" - }, - "displayName": { - "description": "displayName is the display name of the plugin. The dispalyName should be between 1 and 128 characters.", + "infrastructureTopology": { + "description": "infrastructureTopology expresses the expectations for infrastructure services that do not run on control plane nodes, usually indicated by a node selector for a `role` value other than `master`. The default is 'HighlyAvailable', which represents the behavior operators have in a \"normal\" cluster. The 'SingleReplica' mode will be used in single-node deployments and the operators should not configure the operand for highly-available operation NOTE: External topology mode is not applicable for this field.", "type": "string", "default": "" }, - "i18n": { - "description": "i18n is the configuration of plugin's localization resources.", - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginI18n" + "platform": { + "description": "platform is the underlying infrastructure provider for the cluster.\n\nDeprecated: Use platformStatus.type instead.", + "type": "string" }, - "proxy": { - "description": "proxy is a list of proxies that describe various service type to which the plugin needs to connect to.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginProxy" - } + "platformStatus": { + "description": "platformStatus holds status information specific to the underlying infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.PlatformStatus" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsolePluginSpec", + "Kind": "InfrastructureStatus", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleQuickStart": { - "description": "ConsoleQuickStart is an extension for guiding user through various workflows in the OpenShift web console.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.Ingress": { + "description": "Ingress holds cluster-wide information about ingress, including the default ingress domain used for routes. The canonical name is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -27097,20 +27744,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartSpec" + "$ref": "#/definitions/io.openshift.config.v1.IngressSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.IngressStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleQuickStart", + "Kind": "Ingress", "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsoleQuickStartList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.IngressList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -27125,7 +27778,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStart" + "$ref": "#/definitions/io.openshift.config.v1.Ingress" } }, "kind": { @@ -27140,487 +27793,514 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleQuickStartList", + "Kind": "IngressList", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleQuickStartSpec": { - "description": "ConsoleQuickStartSpec is the desired quick start configuration.", + "io.openshift.config.v1.IngressPlatformSpec": { + "description": "IngressPlatformSpec holds the desired state of Ingress specific to the underlying infrastructure provider of the current cluster. Since these are used at spec-level for the underlying cluster, it is supposed that only one of the spec structs is set.", "type": "object", "required": [ - "displayName", - "durationMinutes", - "description", - "introduction", - "tasks" + "type" ], "properties": { - "accessReviewResources": { - "description": "accessReviewResources contains a list of resources that the user's access will be reviewed against in order for the user to complete the Quick Start. The Quick Start will be hidden if any of the access reviews fail.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.authorization.v1.ResourceAttributes" - } - }, - "conclusion": { - "description": "conclusion sums up the Quick Start and suggests the possible next steps. (includes markdown)", - "type": "string" + "aws": { + "description": "aws contains settings specific to the Amazon Web Services infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AWSIngressSpec" }, - "description": { - "description": "description is the description of the Quick Start. (includes markdown)", + "type": { + "description": "type is the underlying infrastructure provider for the cluster. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", \"KubeVirt\", \"EquinixMetal\", \"PowerVS\", \"AlibabaCloud\", \"Nutanix\" and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.", "type": "string", "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "IngressPlatformSpec", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "aws": "AWS" + } + } + ] + }, + "io.openshift.config.v1.IngressSpec": { + "type": "object", + "required": [ + "domain" + ], + "properties": { + "appsDomain": { + "description": "appsDomain is an optional domain to use instead of the one specified in the domain field when a Route is created without specifying an explicit host. If appsDomain is nonempty, this value is used to generate default host values for Route. Unlike domain, appsDomain may be modified after installation. This assumes a new ingresscontroller has been setup with a wildcard certificate.", + "type": "string" }, - "displayName": { - "description": "displayName is the display name of the Quick Start.", - "type": "string", - "default": "" - }, - "durationMinutes": { - "description": "durationMinutes describes approximately how many minutes it will take to complete the Quick Start.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "icon": { - "description": "icon is a base64 encoded image that will be displayed beside the Quick Start display name. The icon should be an vector image for easy scaling. The size of the icon should be 40x40.", - "type": "string" + "componentRoutes": { + "description": "componentRoutes is an optional list of routes that are managed by OpenShift components that a cluster-admin is able to configure the hostname and serving certificate for. The namespace and name of each route in this list should match an existing entry in the status.componentRoutes list.\n\nTo determine the set of configurable Routes, look at namespace and name of entries in the .status.componentRoutes list, where participating operators write the status of configurable routes.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ComponentRouteSpec" + }, + "x-kubernetes-list-map-keys": [ + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, - "introduction": { - "description": "introduction describes the purpose of the Quick Start. (includes markdown)", + "domain": { + "description": "domain is used to generate a default host name for a route when the route's host name is empty. The generated host name will follow this pattern: \"\u003croute-name\u003e.\u003croute-namespace\u003e.\u003cdomain\u003e\".\n\nIt is also used as the default wildcard domain suffix for ingress. The default ingresscontroller domain will follow this pattern: \"*.\u003cdomain\u003e\".\n\nOnce set, changing domain is not currently supported.", "type": "string", "default": "" }, - "nextQuickStart": { - "description": "nextQuickStart is a list of the following Quick Starts, suggested for the user to try.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "prerequisites": { - "description": "prerequisites contains all prerequisites that need to be met before taking a Quick Start. (includes markdown)", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "loadBalancer": { + "description": "loadBalancer contains the load balancer details in general which are not only specific to the underlying infrastructure provider of the current cluster and are required for Ingress Controller to work on OpenShift.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.LoadBalancer" }, - "tags": { - "description": "tags is a list of strings that describe the Quick Start.", + "requiredHSTSPolicies": { + "description": "requiredHSTSPolicies specifies HSTS policies that are required to be set on newly created or updated routes matching the domainPattern/s and namespaceSelector/s that are specified in the policy. Each requiredHSTSPolicy must have at least a domainPattern and a maxAge to validate a route HSTS Policy route annotation, and affect route admission.\n\nA candidate route is checked for HSTS Policies if it has the HSTS Policy route annotation: \"haproxy.router.openshift.io/hsts_header\" E.g. haproxy.router.openshift.io/hsts_header: max-age=31536000;preload;includeSubDomains\n\n- For each candidate route, if it matches a requiredHSTSPolicy domainPattern and optional namespaceSelector, then the maxAge, preloadPolicy, and includeSubdomainsPolicy must be valid to be admitted. Otherwise, the route is rejected. - The first match, by domainPattern and optional namespaceSelector, in the ordering of the RequiredHSTSPolicies determines the route's admission status. - If the candidate route doesn't match any requiredHSTSPolicy domainPattern and optional namespaceSelector, then it may use any HSTS Policy annotation.\n\nThe HSTS policy configuration may be changed after routes have already been created. An update to a previously admitted route may then fail if the updated route does not conform to the updated HSTS policy configuration. However, changing the HSTS policy configuration will not cause a route that is already admitted to stop working.\n\nNote that if there are no RequiredHSTSPolicies, any HSTS Policy annotation on the route is valid.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.RequiredHSTSPolicy" } - }, - "tasks": { - "description": "tasks is the list of steps the user has to perform to complete the Quick Start.", + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "IngressSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.IngressStatus": { + "type": "object", + "properties": { + "componentRoutes": { + "description": "componentRoutes is where participating operators place the current route status for routes whose hostnames and serving certificates can be customized by the cluster-admin.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartTask" - } + "$ref": "#/definitions/io.openshift.config.v1.ComponentRouteStatus" + }, + "x-kubernetes-list-map-keys": [ + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "defaultPlacement": { + "description": "defaultPlacement is set at installation time to control which nodes will host the ingress router pods by default. The options are control-plane nodes or worker nodes.\n\nThis field works by dictating how the Cluster Ingress Operator will consider unset replicas and nodePlacement fields in IngressController resources when creating the corresponding Deployments.\n\nSee the documentation for the IngressController replicas and nodePlacement fields for more information.\n\nWhen omitted, the default value is Workers", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleQuickStartSpec", + "Kind": "IngressStatus", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleQuickStartTask": { - "description": "ConsoleQuickStartTask is a single step in a Quick Start.", + "io.openshift.config.v1.IntermediateTLSProfile": { + "description": "IntermediateTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "IntermediateTLSProfile", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.KeystoneIdentityProvider": { + "description": "KeystonePasswordIdentityProvider provides identities for users authenticating using keystone password credentials", "type": "object", "required": [ - "title", - "description" + "url", + "domainName" ], "properties": { - "description": { - "description": "description describes the steps needed to complete the task. (includes markdown)", + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "domainName": { + "description": "domainName is required for keystone v3", "type": "string", "default": "" }, - "review": { - "description": "review contains instructions to validate the task is complete. The user will select 'Yes' or 'No'. using a radio button, which indicates whether the step was completed successfully.", - "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartTaskReview" + "tlsClientCert": { + "description": "tlsClientCert is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate to present when connecting to the server. The key \"tls.crt\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "summary": { - "description": "summary contains information about the passed step.", - "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartTaskSummary" + "tlsClientKey": { + "description": "tlsClientKey is an optional reference to a secret by name that contains the PEM-encoded TLS private key for the client certificate referenced in tlsClientCert. The key \"tls.key\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "title": { - "description": "title describes the task and is displayed as a step heading.", + "url": { + "description": "url is the remote URL to connect to", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleQuickStartTask", + "Kind": "KeystoneIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleQuickStartTaskReview": { - "description": "ConsoleQuickStartTaskReview contains instructions that validate a task was completed successfully.", + "io.openshift.config.v1.KubeClientConfig": { "type": "object", "required": [ - "instructions", - "failedTaskHelp" + "kubeConfig", + "connectionOverrides" ], "properties": { - "failedTaskHelp": { - "description": "failedTaskHelp contains suggestions for a failed task review and is shown at the end of task. (includes markdown)", - "type": "string", - "default": "" + "connectionOverrides": { + "description": "connectionOverrides specifies client overrides for system components to loop back to this master.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClientConnectionOverrides" }, - "instructions": { - "description": "instructions contains steps that user needs to take in order to validate his work after going through a task. (includes markdown)", + "kubeConfig": { + "description": "kubeConfig is a .kubeconfig filename for going to the owning kube-apiserver. Empty uses an in-cluster-config", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleQuickStartTaskReview", + "Kind": "KubeClientConfig", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleQuickStartTaskSummary": { - "description": "ConsoleQuickStartTaskSummary contains information about a passed step.", + "io.openshift.config.v1.KubevirtPlatformSpec": { + "description": "KubevirtPlatformSpec holds the desired state of the kubevirt infrastructure provider. This only includes fields that can be modified in the cluster.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "KubevirtPlatformSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.KubevirtPlatformStatus": { + "description": "KubevirtPlatformStatus holds the current status of the kubevirt infrastructure provider.", "type": "object", - "required": [ - "success", - "failed" - ], "properties": { - "failed": { - "description": "failed briefly describes the unsuccessfully passed task. (includes markdown)", - "type": "string", - "default": "" + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.", + "type": "string" }, - "success": { - "description": "success describes the succesfully passed task.", - "type": "string", - "default": "" + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleQuickStartTaskSummary", + "Kind": "KubevirtPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSample": { - "description": "ConsoleSample is an extension to customizing OpenShift web console by adding samples.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.LDAPAttributeMapping": { + "description": "LDAPAttributeMapping maps LDAP attributes to OpenShift identity fields", "type": "object", "required": [ - "metadata", - "spec" + "id" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "email": { + "description": "email is the list of attributes whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "id": { + "description": "id is the list of attributes whose values should be used as the user ID. Required. First non-empty attribute is used. At least one attribute is required. If none of the listed attribute have a value, authentication fails. LDAP standard identity attribute is \"dn\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "name": { + "description": "name is the list of attributes whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity LDAP standard display name attribute is \"cn\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "spec": { - "description": "spec contains configuration for a console sample.", - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleSpec" + "preferredUsername": { + "description": "preferredUsername is the list of attributes whose values should be used as the preferred username. LDAP standard login attribute is \"uid\"", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { - "Type": "object", - "Group": "console.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSample", - "Scope": "Clustered" + "Kind": "LDAPAttributeMapping", + "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleContainerImportSource": { - "description": "ConsoleSampleContainerImportSource let the user import a container image.", + "io.openshift.config.v1.LDAPIdentityProvider": { + "description": "LDAPPasswordIdentityProvider provides identities for users authenticating using LDAP credentials", "type": "object", "required": [ - "image" + "url", + "insecure", + "attributes" ], "properties": { - "image": { - "description": "reference to a container image that provides a HTTP service. The service must be exposed on the default port (8080) unless otherwise configured with the port field.\n\nSupported formats:\n - \u003crepository-name\u003e/\u003cimage-name\u003e\n - docker.io/\u003crepository-name\u003e/\u003cimage-name\u003e\n - quay.io/\u003crepository-name\u003e/\u003cimage-name\u003e\n - quay.io/\u003crepository-name\u003e/\u003cimage-name\u003e@sha256:\u003cimage hash\u003e\n - quay.io/\u003crepository-name\u003e/\u003cimage-name\u003e:\u003ctag\u003e", + "attributes": { + "description": "attributes maps LDAP attributes to identities", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.LDAPAttributeMapping" + }, + "bindDN": { + "description": "bindDN is an optional DN to bind with during the search phase.", "type": "string", "default": "" }, - "service": { - "description": "service contains configuration for the Service resource created for this sample.", + "bindPassword": { + "description": "bindPassword is an optional reference to a secret by name containing a password to bind with during the search phase. The key \"bindPassword\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleContainerImportSourceService" + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "insecure": { + "description": "insecure, if true, indicates the connection should not use TLS WARNING: Should not be set to `true` with the URL scheme \"ldaps://\" as \"ldaps://\" URLs always\n attempt to connect using TLS, even when `insecure` is set to `true`\nWhen `true`, \"ldap://\" URLS connect insecurely. When `false`, \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830.", + "type": "boolean", + "default": false + }, + "url": { + "description": "url is an RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is: ldap://host:port/basedn?attribute?scope?filter", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleContainerImportSource", + "Kind": "LDAPIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleContainerImportSourceService": { - "description": "ConsoleSampleContainerImportSourceService let the samples author define defaults for the Service created for this sample.", + "io.openshift.config.v1.LeaderElection": { + "description": "LeaderElection provides information to elect a leader", "type": "object", + "required": [ + "leaseDuration", + "renewDeadline", + "retryPeriod" + ], "properties": { - "targetPort": { - "description": "targetPort is the port that the service listens on for HTTP requests. This port will be used for Service and Route created for this sample. Port must be in the range 1 to 65535. Default port is 8080.", - "type": "integer", - "format": "int32" + "disable": { + "description": "disable allows leader election to be suspended while allowing a fully defaulted \"normal\" startup case.", + "type": "boolean" + }, + "leaseDuration": { + "description": "leaseDuration is the duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled.", + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "name": { + "description": "name indicates what name to use for the resource", + "type": "string" + }, + "namespace": { + "description": "namespace indicates which namespace the resource is in", + "type": "string" + }, + "renewDeadline": { + "description": "renewDeadline is the interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled.", + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "retryPeriod": { + "description": "retryPeriod is the duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled.", + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleContainerImportSourceService", + "Kind": "LeaderElection", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleGitImportSource": { - "description": "ConsoleSampleGitImportSource let the user import code from a public Git repository.", + "io.openshift.config.v1.LoadBalancer": { "type": "object", - "required": [ - "repository" - ], "properties": { - "repository": { - "description": "repository contains the reference to the actual Git repository.", - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleGitImportSourceRepository" - }, - "service": { - "description": "service contains configuration for the Service resource created for this sample.", + "platform": { + "description": "platform holds configuration specific to the underlying infrastructure provider for the ingress load balancers. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time.", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleGitImportSourceService" + "$ref": "#/definitions/io.openshift.config.v1.IngressPlatformSpec" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleGitImportSource", + "Kind": "LoadBalancer", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleGitImportSourceRepository": { - "description": "ConsoleSampleGitImportSourceRepository let the user import code from a public git repository.", + "io.openshift.config.v1.MTUMigration": { + "description": "MTUMigration contains infomation about MTU migration.", "type": "object", - "required": [ - "url" - ], "properties": { - "contextDir": { - "description": "contextDir is used to specify a directory within the repository to build the component. Must start with `/` and have a maximum length of 256 characters. When omitted, the default value is to build from the root of the repository.", - "type": "string", - "default": "" - }, - "revision": { - "description": "revision is the git revision at which to clone the git repository Can be used to clone a specific branch, tag or commit SHA. Must be at most 256 characters in length. When omitted the repository's default branch is used.", - "type": "string", - "default": "" + "machine": { + "description": "Machine contains MTU migration configuration for the machine's uplink.", + "$ref": "#/definitions/io.openshift.config.v1.MTUMigrationValues" }, - "url": { - "description": "url of the Git repository that contains a HTTP service. The HTTP service must be exposed on the default port (8080) unless otherwise configured with the port field.\n\nOnly public repositories on GitHub, GitLab and Bitbucket are currently supported:\n\n - https://github.com/\u003corg\u003e/\u003crepository\u003e\n - https://gitlab.com/\u003corg\u003e/\u003crepository\u003e\n - https://bitbucket.org/\u003corg\u003e/\u003crepository\u003e\n\nThe url must have a maximum length of 256 characters.", - "type": "string", - "default": "" + "network": { + "description": "Network contains MTU migration configuration for the default network.", + "$ref": "#/definitions/io.openshift.config.v1.MTUMigrationValues" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleGitImportSourceRepository", + "Kind": "MTUMigration", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleGitImportSourceService": { - "description": "ConsoleSampleGitImportSourceService let the samples author define defaults for the Service created for this sample.", + "io.openshift.config.v1.MTUMigrationValues": { + "description": "MTUMigrationValues contains the values for a MTU migration.", "type": "object", + "required": [ + "to" + ], "properties": { - "targetPort": { - "description": "targetPort is the port that the service listens on for HTTP requests. This port will be used for Service created for this sample. Port must be in the range 1 to 65535. Default port is 8080.", + "from": { + "description": "From is the MTU to migrate from.", "type": "integer", - "format": "int32" + "format": "int64" + }, + "to": { + "description": "To is the MTU to migrate to.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleGitImportSourceService", + "Kind": "MTUMigrationValues", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.MaxAgePolicy": { + "description": "MaxAgePolicy contains a numeric range for specifying a compliant HSTS max-age for the enclosing RequiredHSTSPolicy", "type": "object", - "required": [ - "metadata", - "items" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSample" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "largestMaxAge": { + "description": "The largest allowed value (in seconds) of the RequiredHSTSPolicy max-age This value can be left unspecified, in which case no upper limit is enforced.", + "type": "integer", + "format": "int32" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "smallestMaxAge": { + "description": "The smallest allowed value (in seconds) of the RequiredHSTSPolicy max-age Setting max-age=0 allows the deletion of an existing HSTS header from a host. This is a necessary tool for administrators to quickly correct mistakes. This value can be left unspecified, in which case no lower limit is enforced.", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { - "Type": "list", - "Group": "console.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleList", + "Kind": "MaxAgePolicy", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleSampleSource": { - "description": "ConsoleSampleSource is the actual sample definition and can hold different sample types. Unsupported sample types will be ignored in the web console.", + "io.openshift.config.v1.ModernTLSProfile": { + "description": "ModernTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility", "type": "object", - "required": [ - "type" - ], - "properties": { - "containerImport": { - "description": "containerImport allows the user import a container image.", - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleContainerImportSource" - }, - "gitImport": { - "description": "gitImport allows the user to import code from a git repository.", - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleGitImportSource" - }, - "type": { - "description": "type of the sample, currently supported: \"GitImport\";\"ContainerImport\"", - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleSource", + "Kind": "ModernTLSProfile", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "containerImport": "ContainerImport", - "gitImport": "GitImport" - } - } - ] + } }, - "io.openshift.console.v1.ConsoleSampleSpec": { - "description": "ConsoleSampleSpec is the desired sample for the web console. Samples will appear with their title, descriptions and a badge in a samples catalog.", + "io.openshift.config.v1.NamedCertificate": { + "description": "NamedCertificate specifies a certificate/key, and the names it should be served for", "type": "object", "required": [ - "title", - "abstract", - "description", - "source" + "certFile", + "keyFile" ], "properties": { - "abstract": { - "description": "abstract is a short introduction to the sample.\n\nIt is required and must be no more than 100 characters in length.\n\nThe abstract is shown on the sample card tile below the title and provider and is limited to three lines of content.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "description": { - "description": "description is a long form explanation of the sample.\n\nIt is required and can have a maximum length of **4096** characters.\n\nIt is a README.md-like content for additional information, links, pre-conditions, and other instructions. It will be rendered as Markdown so that it can contain line breaks, links, and other simple formatting.", + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" }, - "icon": { - "description": "icon is an optional base64 encoded image and shown beside the sample title.\n\nThe format must follow the data: URL format and can have a maximum size of **10 KB**.\n\n data:[\u003cmediatype\u003e][;base64],\u003cbase64 encoded image\u003e\n\nFor example:\n\n data:image;base64, plus the base64 encoded image.\n\nVector images can also be used. SVG icons must start with:\n\n data:image/svg+xml;base64, plus the base64 encoded SVG image.\n\nAll sample catalog icons will be shown on a white background (also when the dark theme is used). The web console ensures that different aspect ratios work correctly. Currently, the surface of the icon is at most 40x100px.\n\nFor more information on the data URL format, please visit https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URLs.", - "type": "string", - "default": "" - }, - "provider": { - "description": "provider is an optional label to honor who provides the sample.\n\nIt is optional and must be no more than 50 characters in length.\n\nA provider can be a company like \"Red Hat\" or an organization like \"CNCF\" or \"Knative\".\n\nCurrently, the provider is only shown on the sample card tile below the title with the prefix \"Provided by \"", - "type": "string", - "default": "" - }, - "source": { - "description": "source defines where to deploy the sample service from. The sample may be sourced from an external git repository or container image.", - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleSource" - }, - "tags": { - "description": "tags are optional string values that can be used to find samples in the samples catalog.\n\nExamples of common tags may be \"Java\", \"Quarkus\", etc.\n\nThey will be displayed on the samples details page.", + "names": { + "description": "Names is a list of DNS names this certificate should be used to secure A name can be a normal DNS name, or can contain leading wildcard segments.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "title": { - "description": "title is the display name of the sample.\n\nIt is required and must be no more than 50 characters in length.", - "type": "string", - "default": "" - }, - "type": { - "description": "type is an optional label to group multiple samples.\n\nIt is optional and must be no more than 20 characters in length.\n\nRecommendation is a singular term like \"Builder Image\", \"Devfile\" or \"Serverless Function\".\n\nCurrently, the type is shown a badge on the sample card tile in the top right corner.", - "type": "string", - "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleSampleSpec", + "Kind": "NamedCertificate", "Scope": "Namespaced" } }, - "io.openshift.console.v1.ConsoleYAMLSample": { - "description": "ConsoleYAMLSample is an extension for customizing OpenShift web console YAML samples.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.Network": { + "description": "Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc. Please view network.spec for an explanation on what applies when configuring this resource.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "spec" ], "properties": { @@ -27638,241 +28318,116 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec holds user settable values for configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.", "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleYAMLSampleSpec" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsoleYAMLSample", - "Scope": "Clustered" - } - }, - "io.openshift.console.v1.ConsoleYAMLSampleList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.console.v1.ConsoleYAMLSample" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "$ref": "#/definitions/io.openshift.config.v1.NetworkSpec" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.openshift.config.v1.NetworkStatus" } }, "x-fabric8-info": { - "Type": "list", - "Group": "console.openshift.io", + "Type": "object", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ConsoleYAMLSampleList", - "Scope": "Namespaced" + "Kind": "Network", + "Scope": "Clustered" } }, - "io.openshift.console.v1.ConsoleYAMLSampleSpec": { - "description": "ConsoleYAMLSampleSpec is the desired YAML sample configuration. Samples will appear with their descriptions in a samples sidebar when creating a resources in the web console.", + "io.openshift.config.v1.NetworkDiagnostics": { "type": "object", - "required": [ - "targetResource", - "title", - "description", - "yaml" - ], "properties": { - "description": { - "description": "description of the YAML sample.", + "mode": { + "description": "mode controls the network diagnostics mode\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is All.", "type": "string", "default": "" }, - "snippet": { - "description": "snippet indicates that the YAML sample is not the full YAML resource definition, but a fragment that can be inserted into the existing YAML document at the user's cursor.", - "type": "boolean", - "default": false - }, - "targetResource": { - "description": "targetResource contains apiVersion and kind of the resource YAML sample is representating.", + "sourcePlacement": { + "description": "sourcePlacement controls the scheduling of network diagnostics source deployment\n\nSee NetworkDiagnosticsSourcePlacement for more details about default values.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.TypeMeta" - }, - "title": { - "description": "title of the YAML sample.", - "type": "string", - "default": "" - }, - "yaml": { - "description": "yaml is the YAML sample to display.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "console.openshift.io", - "Version": "v1", - "Kind": "ConsoleYAMLSampleSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.console.v1.Link": { - "description": "Represents a standard link that could be generated in HTML", - "type": "object", - "required": [ - "text", - "href" - ], - "properties": { - "href": { - "description": "href is the absolute secure URL for the link (must use https)", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.config.v1.NetworkDiagnosticsSourcePlacement" }, - "text": { - "description": "text is the display text for the link", - "type": "string", - "default": "" + "targetPlacement": { + "description": "targetPlacement controls the scheduling of network diagnostics target daemonset\n\nSee NetworkDiagnosticsTargetPlacement for more details about default values.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.NetworkDiagnosticsTargetPlacement" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "Link", + "Kind": "NetworkDiagnostics", "Scope": "Namespaced" } }, - "io.openshift.console.v1.NamespaceDashboardSpec": { - "description": "NamespaceDashboardSpec is a specification of namespaces in which the dashboard link should appear. If both namespaces and namespaceSelector are specified, the link will appear in namespaces that match either", + "io.openshift.config.v1.NetworkDiagnosticsSourcePlacement": { + "description": "NetworkDiagnosticsSourcePlacement defines node scheduling configuration network diagnostics source components", "type": "object", "properties": { - "namespaceSelector": { - "description": "namespaceSelector is used to select the Namespaces that should contain dashboard link by label. If the namespace labels match, dashboard link will be shown for the namespaces.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - }, - "namespaces": { - "description": "namespaces is an array of namespace names in which the dashboard link should appear.", - "type": "array", - "items": { + "nodeSelector": { + "description": "nodeSelector is the node selector applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `kubernetes.io/os: linux`.", + "type": "object", + "additionalProperties": { "type": "string", "default": "" } + }, + "tolerations": { + "description": "tolerations is a list of tolerations applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is an empty list.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", - "Group": "console.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "NamespaceDashboardSpec", + "Kind": "NetworkDiagnosticsSourcePlacement", "Scope": "Namespaced" } }, - "io.openshift.example.v1.CELUnion": { - "description": "CELUnion demonstrates how to use a discriminated union and how to validate it using CEL.", + "io.openshift.config.v1.NetworkDiagnosticsTargetPlacement": { + "description": "NetworkDiagnosticsTargetPlacement defines node scheduling configuration network diagnostics target components", "type": "object", "properties": { - "optionalMember": { - "description": "optionalMember is a union member that is optional.", - "type": "string" - }, - "requiredMember": { - "description": "requiredMember is a union member that is required.", - "type": "string" - }, - "type": { - "description": "type determines which of the union members should be populated.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "example.openshift.io", - "Version": "v1", - "Kind": "CELUnion", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "optionalMember": "OptionalMember", - "requiredMember": "RequiredMember" + "nodeSelector": { + "description": "nodeSelector is the node selector applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `kubernetes.io/os: linux`.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" } - } - ] - }, - "io.openshift.example.v1.EvolvingUnion": { - "type": "object", - "properties": { - "type": { - "description": "type is the discriminator. It has different values for Default and for TechPreviewNoUpgrade", - "type": "string" + }, + "tolerations": { + "description": "tolerations is a list of tolerations applied to network diagnostics components\n\nWhen omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `- operator: \"Exists\"` which means that all taints are tolerated.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", - "Group": "example.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "EvolvingUnion", + "Kind": "NetworkDiagnosticsTargetPlacement", "Scope": "Namespaced" } }, - "io.openshift.example.v1.StableConfigType": { - "description": "StableConfigType is a stable config type that may include TechPreviewNoUpgrade fields.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec is the specification of the desired behavior of the StableConfigType.", - "default": {}, - "$ref": "#/definitions/io.openshift.example.v1.StableConfigTypeSpec" - }, - "status": { - "description": "status is the most recently observed status of the StableConfigType.", - "default": {}, - "$ref": "#/definitions/io.openshift.example.v1.StableConfigTypeStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "example.openshift.io", - "Version": "v1", - "Kind": "StableConfigType", - "Scope": "Clustered" - } - }, - "io.openshift.example.v1.StableConfigTypeList": { - "description": "StableConfigTypeList contains a list of StableConfigTypes.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.NetworkList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -27884,7 +28439,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.example.v1.StableConfigType" + "$ref": "#/definitions/io.openshift.config.v1.Network" } }, "kind": { @@ -27899,31 +28454,67 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "example.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "StableConfigTypeList", + "Kind": "NetworkList", "Scope": "Namespaced" } }, - "io.openshift.example.v1.StableConfigTypeSpec": { - "description": "StableConfigTypeSpec is the desired state", + "io.openshift.config.v1.NetworkMigration": { + "description": "NetworkMigration represents the network migration status.", + "type": "object", + "properties": { + "mtu": { + "description": "MTU is the MTU configuration that is being deployed.", + "$ref": "#/definitions/io.openshift.config.v1.MTUMigration" + }, + "networkType": { + "description": "NetworkType is the target plugin that is being deployed. DEPRECATED: network type migration is no longer supported, so this should always be unset.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NetworkMigration", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.NetworkSpec": { + "description": "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.", "type": "object", "required": [ - "immutableField" + "clusterNetwork", + "serviceNetwork", + "networkType" ], "properties": { - "celUnion": { - "description": "celUnion demonstrates how to validate a discrminated union using CEL", + "clusterNetwork": { + "description": "IP address pool to use for pod IPs. This field is immutable after installation.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterNetworkEntry" + }, + "x-kubernetes-list-type": "atomic" + }, + "externalIP": { + "description": "externalIP defines configuration for controllers that affect Service.ExternalIP. If nil, then ExternalIP is not allowed to be set.", + "$ref": "#/definitions/io.openshift.config.v1.ExternalIPConfig" + }, + "networkDiagnostics": { + "description": "networkDiagnostics defines network diagnostics configuration.\n\nTakes precedence over spec.disableNetworkDiagnostics in network.operator.openshift.io. If networkDiagnostics is not specified or is empty, and the spec.disableNetworkDiagnostics flag in network.operator.openshift.io is set to true, the network diagnostics feature will be disabled.", "default": {}, - "$ref": "#/definitions/io.openshift.example.v1.CELUnion" + "$ref": "#/definitions/io.openshift.config.v1.NetworkDiagnostics" }, - "coolNewField": { - "description": "coolNewField is a field that is for tech preview only. On normal clusters this shouldn't be present", + "networkType": { + "description": "NetworkType is the plugin that is to be deployed (e.g. OVNKubernetes). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OVNKubernetes This field is immutable after installation.", "type": "string", "default": "" }, - "evolvingCollection": { - "description": "evolvingCollection demonstrates how to have a collection where the maximum number of items varies on cluster type. For default clusters, this will be \"1\" but on TechPreview clusters, this value will be \"3\".", + "serviceNetwork": { + "description": "IP address pool for services. Currently, we only support a single entry here. This field is immutable after installation.", "type": "array", "items": { "type": "string", @@ -27931,47 +28522,39 @@ }, "x-kubernetes-list-type": "atomic" }, - "evolvingUnion": { - "description": "evolvingUnion demonstrates how to phase in new values into discriminated union", - "default": {}, - "$ref": "#/definitions/io.openshift.example.v1.EvolvingUnion" - }, - "immutableField": { - "description": "immutableField is a field that is immutable once the object has been created. It is required at all times.", - "type": "string", - "default": "" - }, - "nonZeroDefault": { - "description": "nonZeroDefault is a demonstration of creating an integer field that has a non zero default. It required two default tags (one for CRD generation, one for client generation) and must have `omitempty` and be optional. A minimum value is added to demonstrate that a zero value would not be accepted.", - "type": "integer", - "format": "int32", - "default": 8 - }, - "optionalImmutableField": { - "description": "optionalImmutableField is a field that is immutable once set. It is optional but may not be changed once set.", - "type": "string", - "default": "" - }, - "stableField": { - "description": "stableField is a field that is present on default clusters and on tech preview clusters\n\nIf empty, the platform will choose a good default, which may change over time without notice.", - "type": "string", - "default": "" + "serviceNodePortRange": { + "description": "The port range allowed for Services of type NodePort. If not specified, the default of 30000-32767 will be used. Such Services without a NodePort specified will have one automatically allocated from this range. This parameter can be updated after the cluster is installed.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "example.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "StableConfigTypeSpec", + "Kind": "NetworkSpec", "Scope": "Namespaced" } }, - "io.openshift.example.v1.StableConfigTypeStatus": { - "description": "StableConfigTypeStatus defines the observed status of the StableConfigType.", + "io.openshift.config.v1.NetworkStatus": { + "description": "NetworkStatus is the current network configuration.", "type": "object", "properties": { + "clusterNetwork": { + "description": "IP address pool to use for pod IPs.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ClusterNetworkEntry" + }, + "x-kubernetes-list-type": "atomic" + }, + "clusterNetworkMTU": { + "description": "ClusterNetworkMTU is the MTU for inter-pod networking.", + "type": "integer", + "format": "int32" + }, "conditions": { - "description": "Represents the observations of a foo's current state. Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"", + "description": "conditions represents the observations of a network.config current state. Known .status.conditions.type are: \"NetworkDiagnosticsAvailable\"", "type": "array", "items": { "default": {}, @@ -27984,22 +28567,38 @@ "x-kubernetes-patch-merge-key": "type", "x-kubernetes-patch-strategy": "merge" }, - "immutableField": { - "description": "immutableField is a field that is immutable once the object has been created. It is required at all times.", + "migration": { + "description": "Migration contains the cluster network migration configuration.", + "$ref": "#/definitions/io.openshift.config.v1.NetworkMigration" + }, + "networkType": { + "description": "NetworkType is the plugin that is deployed (e.g. OVNKubernetes).", "type": "string" + }, + "serviceNetwork": { + "description": "IP address pool for services. Currently, we only support a single entry here.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", - "Group": "example.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "StableConfigTypeStatus", + "Kind": "NetworkStatus", "Scope": "Namespaced" } }, - "io.openshift.example.v1alpha1.NotStableConfigType": { - "description": "NotStableConfigType is a stable config type that is TechPreviewNoUpgrade only.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.Node": { + "description": "Node holds cluster-wide information about node specific features.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "spec" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -28015,28 +28614,29 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec is the specification of the desired behavior of the NotStableConfigType.", + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.example.v1alpha1.NotStableConfigTypeSpec" + "$ref": "#/definitions/io.openshift.config.v1.NodeSpec" }, "status": { - "description": "status is the most recently observed status of the NotStableConfigType.", + "description": "status holds observed values.", "default": {}, - "$ref": "#/definitions/io.openshift.example.v1alpha1.NotStableConfigTypeStatus" + "$ref": "#/definitions/io.openshift.config.v1.NodeStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "example.openshift.io", - "Version": "v1alpha1", - "Kind": "NotStableConfigType", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "Node", "Scope": "Clustered" } }, - "io.openshift.example.v1alpha1.NotStableConfigTypeList": { - "description": "NotStableConfigTypeList contains a list of NotStableConfigTypes.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.NodeList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -28048,7 +28648,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.example.v1alpha1.NotStableConfigType" + "$ref": "#/definitions/io.openshift.config.v1.Node" } }, "kind": { @@ -28063,39 +28663,37 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "example.openshift.io", - "Version": "v1alpha1", - "Kind": "NotStableConfigTypeList", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NodeList", "Scope": "Namespaced" } }, - "io.openshift.example.v1alpha1.NotStableConfigTypeSpec": { - "description": "NotStableConfigTypeSpec is the desired state", + "io.openshift.config.v1.NodeSpec": { "type": "object", - "required": [ - "newField" - ], "properties": { - "newField": { - "description": "newField is a field that is tech preview, but because the entire type is gated, there is no marker on the field.", - "type": "string", - "default": "" + "cgroupMode": { + "description": "CgroupMode determines the cgroups version on the node", + "type": "string" + }, + "workerLatencyProfile": { + "description": "WorkerLatencyProfile determins the how fast the kubelet is updating the status and corresponding reaction of the cluster", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "example.openshift.io", - "Version": "v1alpha1", - "Kind": "NotStableConfigTypeSpec", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NodeSpec", "Scope": "Namespaced" } }, - "io.openshift.example.v1alpha1.NotStableConfigTypeStatus": { - "description": "NotStableConfigTypeStatus defines the observed status of the NotStableConfigType.", + "io.openshift.config.v1.NodeStatus": { "type": "object", "properties": { "conditions": { - "description": "Represents the observations of a foo's current state. Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"", + "description": "conditions contain the details and the current state of the nodes.config object", "type": "array", "items": { "default": {}, @@ -28111,210 +28709,270 @@ }, "x-fabric8-info": { "Type": "nested", - "Group": "example.openshift.io", - "Version": "v1alpha1", - "Kind": "NotStableConfigTypeStatus", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NodeStatus", "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.ConnectionConfig": { + "io.openshift.config.v1.NutanixFailureDomain": { + "description": "NutanixFailureDomain configures failure domain information for the Nutanix platform.", "type": "object", "required": [ - "url" + "name", + "cluster", + "subnets" ], "properties": { - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca-bundle.crt\" is used to locate the data. If empty, the default system roots are used. The namespace for this config map is openshift-config.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "tlsClientConfig": { - "description": "tlsClientConfig is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate and private key to present when connecting to the server. The key \"tls.crt\" is used to locate the client certificate. The key \"tls.key\" is used to locate the private key. The namespace for this secret is openshift-config.", + "cluster": { + "description": "cluster is to identify the cluster (the Prism Element under management of the Prism Central), in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "$ref": "#/definitions/io.openshift.config.v1.NutanixResourceIdentifier" }, - "url": { - "description": "Chart repository URL", + "name": { + "description": "name defines the unique name of a failure domain. Name is required and must be at most 64 characters in length. It must consist of only lower case alphanumeric characters and hyphens (-). It must start and end with an alphanumeric character. This value is arbitrary and is used to identify the failure domain within the platform.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "ConnectionConfig", + }, + "subnets": { + "description": "subnets holds a list of identifiers (one or more) of the cluster's network subnets for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.NutanixResourceIdentifier" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixFailureDomain", "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.ConnectionConfigNamespaceScoped": { + "io.openshift.config.v1.NutanixPlatformLoadBalancer": { + "description": "NutanixPlatformLoadBalancer defines the load balancer used by the cluster on Nutanix platform.", "type": "object", - "required": [ - "url" - ], "properties": { - "basicAuthConfig": { - "description": "basicAuthConfig is an optional reference to a secret by name that contains the basic authentication credentials to present when connecting to the server. The key \"username\" is used locate the username. The key \"password\" is used to locate the password. The namespace for this secret must be same as the namespace where the project helm chart repository is getting instantiated.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "ca": { - "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca-bundle.crt\" is used to locate the data. If empty, the default system roots are used. The namespace for this configmap must be same as the namespace where the project helm chart repository is getting instantiated.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "tlsClientConfig": { - "description": "tlsClientConfig is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate and private key to present when connecting to the server. The key \"tls.crt\" is used to locate the client certificate. The key \"tls.key\" is used to locate the private key. The namespace for this secret must be same as the namespace where the project helm chart repository is getting instantiated.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" - }, - "url": { - "description": "Chart repository URL", + "type": { + "description": "type defines the type of load balancer used by the cluster on Nutanix platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", "type": "string", - "default": "" + "default": "OpenShiftManagedDefault" } }, "x-fabric8-info": { "Type": "nested", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "ConnectionConfigNamespaceScoped", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixPlatformLoadBalancer", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": {} + } + ] }, - "io.openshift.helm.v1beta1.HelmChartRepository": { - "description": "HelmChartRepository holds cluster-wide configuration for proxied Helm chart repository\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.NutanixPlatformSpec": { + "description": "NutanixPlatformSpec holds the desired state of the Nutanix infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", "required": [ - "spec" + "prismCentral", + "prismElements" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "failureDomains": { + "description": "failureDomains configures failure domains information for the Nutanix platform. When set, the failure domains defined here may be used to spread Machines across prism element clusters to improve fault tolerance of the cluster.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.NutanixFailureDomain" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" }, - "spec": { - "description": "spec holds user settable values for configuration", + "prismCentral": { + "description": "prismCentral holds the endpoint address and port to access the Nutanix Prism Central. When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list.", "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepositorySpec" + "$ref": "#/definitions/io.openshift.config.v1.NutanixPrismEndpoint" }, - "status": { - "description": "Observed status of the repository within the cluster..", - "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepositoryStatus" + "prismElements": { + "description": "prismElements holds one or more endpoint address and port data to access the Nutanix Prism Elements (clusters) of the Nutanix Prism Central. Currently we only support one Prism Element (cluster) for an OpenShift cluster, where all the Nutanix resources (VMs, subnets, volumes, etc.) used in the OpenShift cluster are located. In the future, we may support Nutanix resources (VMs, etc.) spread over multiple Prism Elements (clusters) of the Prism Central.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.NutanixPrismElementEndpoint" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { - "Type": "object", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "HelmChartRepository", - "Scope": "Clustered" + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixPlatformSpec", + "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.HelmChartRepositoryList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.NutanixPlatformStatus": { + "description": "NutanixPlatformStatus holds the current status of the Nutanix infrastructure provider.", "type": "object", "required": [ - "metadata", - "items" + "apiServerInternalIPs", + "ingressIPs" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", "type": "string" }, - "items": { + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepository" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, + "loadBalancer": { + "description": "loadBalancer defines how the load balancer used by the cluster is configured.", + "default": { + "type": "OpenShiftManagedDefault" + }, + "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformLoadBalancer" } }, "x-fabric8-info": { - "Type": "list", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "HelmChartRepositoryList", + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.HelmChartRepositorySpec": { - "description": "Helm chart repository exposed within the cluster", + "io.openshift.config.v1.NutanixPrismElementEndpoint": { + "description": "NutanixPrismElementEndpoint holds the name and endpoint data for a Prism Element (cluster)", "type": "object", "required": [ - "connectionConfig" + "name", + "endpoint" ], "properties": { - "connectionConfig": { - "description": "Required configuration for connecting to the chart repo", + "endpoint": { + "description": "endpoint holds the endpoint address and port data of the Prism Element (cluster). When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list.", "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.ConnectionConfig" - }, - "description": { - "description": "Optional human readable repository description, it can be used by UI for displaying purposes", - "type": "string" - }, - "disabled": { - "description": "If set to true, disable the repo usage in the cluster/namespace", - "type": "boolean" + "$ref": "#/definitions/io.openshift.config.v1.NutanixPrismEndpoint" }, "name": { - "description": "Optional associated human readable repository name, it can be used by UI for displaying purposes", - "type": "string" + "description": "name is the name of the Prism Element (cluster). This value will correspond with the cluster field configured on other resources (eg Machines, PVCs, etc).", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "HelmChartRepositorySpec", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixPrismElementEndpoint", "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.HelmChartRepositoryStatus": { + "io.openshift.config.v1.NutanixPrismEndpoint": { + "description": "NutanixPrismEndpoint holds the endpoint address and port to access the Nutanix Prism Central or Element (cluster)", "type": "object", + "required": [ + "address", + "port" + ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their statuses", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - } + "address": { + "description": "address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster)", + "type": "string", + "default": "" + }, + "port": { + "description": "port is the port number to access the Nutanix Prism Central or Element (cluster)", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "HelmChartRepositoryStatus", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixPrismEndpoint", "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.ProjectHelmChartRepository": { - "description": "ProjectHelmChartRepository holds namespace-wide configuration for proxied Helm chart repository\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.NutanixResourceIdentifier": { + "description": "NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, etc.)", + "type": "object", + "required": [ + "type" + ], + "properties": { + "name": { + "description": "name is the resource name in the PC. It cannot be empty if the type is Name.", + "type": "string" + }, + "type": { + "description": "type is the identifier type to use for this resource.", + "type": "string", + "default": "" + }, + "uuid": { + "description": "uuid is the UUID of the resource in the PC. It cannot be empty if the type is UUID.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "NutanixResourceIdentifier", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "name": "Name", + "uuid": "UUID" + } + } + ] + }, + "io.openshift.config.v1.OAuth": { + "description": "OAuth holds cluster-wide information about OAuth. The canonical name is `cluster`. It is used to configure the integrated OAuth server. This configuration is only honored when the top level Authentication config has type set to IntegratedOAuth.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "spec" ], "properties": { @@ -28334,24 +28992,24 @@ "spec": { "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.ProjectHelmChartRepositorySpec" + "$ref": "#/definitions/io.openshift.config.v1.OAuthSpec" }, "status": { - "description": "Observed status of the repository within the namespace..", + "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepositoryStatus" + "$ref": "#/definitions/io.openshift.config.v1.OAuthStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "ProjectHelmChartRepository", - "Scope": "Namespaced" + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OAuth", + "Scope": "Clustered" } }, - "io.openshift.helm.v1beta1.ProjectHelmChartRepositoryList": { - "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.OAuthList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -28366,7 +29024,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.ProjectHelmChartRepository" + "$ref": "#/definitions/io.openshift.config.v1.OAuth" } }, "kind": { @@ -28381,355 +29039,677 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "ProjectHelmChartRepositoryList", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OAuthList", "Scope": "Namespaced" } }, - "io.openshift.helm.v1beta1.ProjectHelmChartRepositorySpec": { - "description": "Project Helm chart repository exposed within a namespace", + "io.openshift.config.v1.OAuthRemoteConnectionInfo": { + "description": "OAuthRemoteConnectionInfo holds information necessary for establishing a remote connection", "type": "object", "required": [ - "connectionConfig" + "url" ], "properties": { - "connectionConfig": { - "description": "Required configuration for connecting to the chart repo", + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", "default": {}, - "$ref": "#/definitions/io.openshift.helm.v1beta1.ConnectionConfigNamespaceScoped" + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "description": { - "description": "Optional human readable repository description, it can be used by UI for displaying purposes", - "type": "string" + "tlsClientCert": { + "description": "tlsClientCert is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate to present when connecting to the server. The key \"tls.crt\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "disabled": { - "description": "If set to true, disable the repo usage in the namespace", - "type": "boolean" + "tlsClientKey": { + "description": "tlsClientKey is an optional reference to a secret by name that contains the PEM-encoded TLS private key for the client certificate referenced in tlsClientCert. The key \"tls.key\" is used to locate the data. If specified and the secret or expected key is not found, the identity provider is not honored. If the specified certificate data is not valid, the identity provider is not honored. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "name": { - "description": "Optional associated human readable repository name, it can be used by UI for displaying purposes", - "type": "string" + "url": { + "description": "url is the remote URL to connect to", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "helm.openshift.io", - "Version": "v1beta1", - "Kind": "ProjectHelmChartRepositorySpec", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OAuthRemoteConnectionInfo", "Scope": "Namespaced" } }, - "io.openshift.image.v1.DockerImageReference": { - "description": "DockerImageReference points to a container image.", + "io.openshift.config.v1.OAuthSpec": { + "description": "OAuthSpec contains desired cluster auth configuration", "type": "object", "required": [ - "Registry", - "Namespace", - "Name", - "Tag", - "ID" + "tokenConfig" ], "properties": { - "ID": { - "description": "ID is the identifier for the container image", + "identityProviders": { + "description": "identityProviders is an ordered list of ways for a user to identify themselves. When this list is empty, no identities are provisioned for users.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.IdentityProvider" + }, + "x-kubernetes-list-type": "atomic" + }, + "templates": { + "description": "templates allow you to customize pages like the login page.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.OAuthTemplates" + }, + "tokenConfig": { + "description": "tokenConfig contains options for authorization and access tokens", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.TokenConfig" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OAuthSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OAuthStatus": { + "description": "OAuthStatus shows current known state of OAuth server in the cluster", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OAuthStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OAuthTemplates": { + "description": "OAuthTemplates allow for customization of pages like the login page", + "type": "object", + "properties": { + "error": { + "description": "error is the name of a secret that specifies a go template to use to render error pages during the authentication or grant flow. The key \"errors.html\" is used to locate the template data. If specified and the secret or expected key is not found, the default error page is used. If the specified template is not valid, the default error page is used. If unspecified, the default error page is used. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "login": { + "description": "login is the name of a secret that specifies a go template to use to render the login page. The key \"login.html\" is used to locate the template data. If specified and the secret or expected key is not found, the default login page is used. If the specified template is not valid, the default login page is used. If unspecified, the default login page is used. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "providerSelection": { + "description": "providerSelection is the name of a secret that specifies a go template to use to render the provider selection page. The key \"providers.html\" is used to locate the template data. If specified and the secret or expected key is not found, the default provider selection page is used. If the specified template is not valid, the default provider selection page is used. If unspecified, the default provider selection page is used. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OAuthTemplates", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OIDCClientConfig": { + "type": "object", + "required": [ + "componentName", + "componentNamespace", + "clientID", + "clientSecret", + "extraScopes" + ], + "properties": { + "clientID": { + "description": "ClientID is the identifier of the OIDC client from the OIDC provider", "type": "string", "default": "" }, - "Name": { - "description": "Name is the name of the container image", + "clientSecret": { + "description": "ClientSecret refers to a secret in the `openshift-config` namespace that contains the client secret in the `clientSecret` key of the `.data` field", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "componentName": { + "description": "ComponentName is the name of the component that is supposed to consume this client configuration", "type": "string", "default": "" }, - "Namespace": { - "description": "Namespace is the namespace that contains the container image", + "componentNamespace": { + "description": "ComponentNamespace is the namespace of the component that is supposed to consume this client configuration", "type": "string", "default": "" }, - "Registry": { - "description": "Registry is the registry that contains the container image", + "extraScopes": { + "description": "ExtraScopes is an optional set of scopes to request tokens with.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OIDCClientConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OIDCClientReference": { + "type": "object", + "required": [ + "oidcProviderName", + "issuerURL", + "clientID" + ], + "properties": { + "clientID": { + "description": "ClientID is the identifier of the OIDC client from the OIDC provider", "type": "string", "default": "" }, - "Tag": { - "description": "Tag is which tag of the container image is being referenced", + "issuerURL": { + "description": "URL is the serving URL of the token issuer. Must use the https:// scheme.", + "type": "string", + "default": "" + }, + "oidcProviderName": { + "description": "OIDCName refers to the `name` of the provider from `oidcProviders`", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "DockerImageReference", + "Kind": "OIDCClientReference", "Scope": "Namespaced" } }, - "io.openshift.image.v1.Image": { - "description": "Image is an immutable representation of a container image and metadata at a point in time. Images are named by taking a hash of their contents (metadata and content) and any change in format, content, or metadata results in a new name. The images resource is primarily for use by cluster administrators and integrations like the cluster image registry - end users instead access images via the imagestreamtags or imagestreamimages resources. While image metadata is stored in the API, any integration that implements the container image registry API must provide its own storage for the raw manifest data, image config, and layer contents.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.OIDCClientStatus": { "type": "object", + "required": [ + "componentName", + "componentNamespace", + "currentOIDCClients", + "consumingUsers" + ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "componentName": { + "description": "ComponentName is the name of the component that will consume a client configuration.", + "type": "string", + "default": "" }, - "dockerImageConfig": { - "description": "DockerImageConfig is a JSON blob that the runtime uses to set up the container. This is a part of manifest schema v2. Will not be set when the image represents a manifest list.", - "type": "string" + "componentNamespace": { + "description": "ComponentNamespace is the namespace of the component that will consume a client configuration.", + "type": "string", + "default": "" }, - "dockerImageLayers": { - "description": "DockerImageLayers represents the layers in the image. May not be set if the image does not define that data or if the image represents a manifest list.", + "conditions": { + "description": "Conditions are used to communicate the state of the `oidcClients` entry.\n\nSupported conditions include Available, Degraded and Progressing.\n\nIf Available is true, the component is successfully using the configured client. If Degraded is true, that means something has gone wrong trying to handle the client configuration. If Progressing is true, that means the component is taking some action related to the `oidcClients` entry.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageLayer" - } - }, - "dockerImageManifest": { - "description": "DockerImageManifest is the raw JSON of the manifest", - "type": "string" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "dockerImageManifestMediaType": { - "description": "DockerImageManifestMediaType specifies the mediaType of manifest. This is a part of manifest schema v2.", - "type": "string" + "consumingUsers": { + "description": "ConsumingUsers is a slice of ServiceAccounts that need to have read permission on the `clientSecret` secret.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "dockerImageManifests": { - "description": "DockerImageManifests holds information about sub-manifests when the image represents a manifest list. When this field is present, no DockerImageLayers should be specified.", + "currentOIDCClients": { + "description": "CurrentOIDCClients is a list of clients that the component is currently using.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageManifest" - } - }, - "dockerImageMetadata": { - "description": "DockerImageMetadata contains metadata about this image", + "$ref": "#/definitions/io.openshift.config.v1.OIDCClientReference" + }, + "x-kubernetes-list-map-keys": [ + "issuerURL", + "clientID" + ], + "x-kubernetes-list-type": "map" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OIDCClientStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OIDCProvider": { + "type": "object", + "required": [ + "name", + "issuer", + "oidcClients", + "claimMappings" + ], + "properties": { + "claimMappings": { + "description": "ClaimMappings describes rules on how to transform information from an ID token into a cluster identity", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension", - "x-kubernetes-patch-strategy": "replace" - }, - "dockerImageMetadataVersion": { - "description": "DockerImageMetadataVersion conveys the version of the object, which if empty defaults to \"1.0\"", - "type": "string" - }, - "dockerImageReference": { - "description": "DockerImageReference is the string that can be used to pull this image.", - "type": "string" + "$ref": "#/definitions/io.openshift.config.v1.TokenClaimMappings" }, - "dockerImageSignatures": { - "description": "DockerImageSignatures provides the signatures as opaque blobs. This is a part of manifest schema v1.", + "claimValidationRules": { + "description": "ClaimValidationRules are rules that are applied to validate token claims to authenticate users.", "type": "array", "items": { - "type": "string", - "format": "byte" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.TokenClaimValidationRule" + }, + "x-kubernetes-list-type": "atomic" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "issuer": { + "description": "Issuer describes atributes of the OIDC token issuer", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.config.v1.TokenIssuer" }, - "signatures": { - "description": "Signatures holds all signatures of the image.", + "name": { + "description": "Name of the OIDC provider", + "type": "string", + "default": "" + }, + "oidcClients": { + "description": "OIDCClients contains configuration for the platform's clients that need to request tokens from the issuer", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageSignature" + "$ref": "#/definitions/io.openshift.config.v1.OIDCClientConfig" }, - "x-kubernetes-patch-merge-key": "name", - "x-kubernetes-patch-strategy": "merge" + "x-kubernetes-list-map-keys": [ + "componentNamespace", + "componentName" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "Image", - "Scope": "Clustered" + "Kind": "OIDCProvider", + "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageBlobReferences": { - "description": "ImageBlobReferences describes the blob references within an image.", + "io.openshift.config.v1.ObjectReference": { + "description": "ObjectReference contains enough information to let you inspect or modify the referred object.", "type": "object", + "required": [ + "group", + "resource", + "name" + ], "properties": { - "config": { - "description": "config, if set, is the blob that contains the image config. Some images do not have separate config blobs and this field will be set to nil if so.", + "group": { + "description": "group of the referent.", + "type": "string", + "default": "" + }, + "name": { + "description": "name of the referent.", + "type": "string", + "default": "" + }, + "namespace": { + "description": "namespace of the referent.", "type": "string" }, - "imageMissing": { - "description": "imageMissing is true if the image is referenced by the image stream but the image object has been deleted from the API by an administrator. When this field is set, layers and config fields may be empty and callers that depend on the image metadata should consider the image to be unavailable for download or viewing.", - "type": "boolean", - "default": false + "resource": { + "description": "resource of the referent.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ObjectReference", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OldTLSProfile": { + "description": "OldTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OldTLSProfile", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OpenIDClaims": { + "description": "OpenIDClaims contains a list of OpenID claims to use when authenticating with an OpenID identity provider", + "type": "object", + "properties": { + "email": { + "description": "email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "layers": { - "description": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", + "groups": { + "description": "groups is the list of claims value of which should be used to synchronize groups from the OIDC provider to OpenShift for the user. If multiple claims are specified, the first one with a non-empty value is used.", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, - "manifests": { - "description": "manifests is the list of other image names that this image points to. For a single architecture image, it is empty. For a multi-arch image, it consists of the digests of single architecture images, such images shouldn't have layers nor config.", + "name": { + "description": "name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" + }, + "preferredUsername": { + "description": "preferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the sub claim", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageBlobReferences", + "Kind": "OpenIDClaims", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageImportSpec": { - "description": "ImageImportSpec describes a request to import a specific image.", + "io.openshift.config.v1.OpenIDIdentityProvider": { + "description": "OpenIDIdentityProvider provides identities for users authenticating using OpenID credentials", "type": "object", "required": [ - "from" + "clientID", + "clientSecret", + "issuer", + "claims" ], "properties": { - "from": { - "description": "From is the source of an image to import; only kind DockerImage is allowed", + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. If empty, the default system roots are used. The namespace for this config map is openshift-config.", "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "importPolicy": { - "description": "ImportPolicy is the policy controlling how the image is imported", + "claims": { + "description": "claims mappings", "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagImportPolicy" + "$ref": "#/definitions/io.openshift.config.v1.OpenIDClaims" }, - "includeManifest": { - "description": "IncludeManifest determines if the manifest for each image is returned in the response", - "type": "boolean" + "clientID": { + "description": "clientID is the oauth client ID", + "type": "string", + "default": "" }, - "referencePolicy": { - "description": "ReferencePolicy defines how other components should consume the image", + "clientSecret": { + "description": "clientSecret is a required reference to the secret by name containing the oauth client secret. The key \"clientSecret\" is used to locate the data. If the secret or expected key is not found, the identity provider is not honored. The namespace for this secret is openshift-config.", "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagReferencePolicy" + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "to": { - "description": "To is a tag in the current image stream to assign the imported image to, if name is not specified the default tag from from.name will be used", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + "extraAuthorizeParameters": { + "description": "extraAuthorizeParameters are any custom parameters to add to the authorize request.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "extraScopes": { + "description": "extraScopes are any scopes to request in addition to the standard \"openid\" scope.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "issuer": { + "description": "issuer is the URL that the OpenID Provider asserts as its Issuer Identifier. It must use the https scheme with no query or fragment component.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageImportSpec", + "Kind": "OpenIDIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageImportStatus": { - "description": "ImageImportStatus describes the result of an image import.", + "io.openshift.config.v1.OpenStackPlatformLoadBalancer": { + "description": "OpenStackPlatformLoadBalancer defines the load balancer used by the cluster on OpenStack platform.", + "type": "object", + "properties": { + "type": { + "description": "type defines the type of load balancer used by the cluster on OpenStack platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", + "type": "string", + "default": "OpenShiftManagedDefault" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OpenStackPlatformLoadBalancer", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": {} + } + ] + }, + "io.openshift.config.v1.OpenStackPlatformSpec": { + "description": "OpenStackPlatformSpec holds the desired state of the OpenStack infrastructure provider. This only includes fields that can be modified in the cluster.", + "type": "object", + "properties": { + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.apiServerInternalIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.ingressIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "machineNetworks": { + "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6, for example \"10.0.0.0/8\" or \"fd00::/8\".", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OpenStackPlatformSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.OpenStackPlatformStatus": { + "description": "OpenStackPlatformStatus holds the current status of the OpenStack infrastructure provider.", "type": "object", "required": [ - "status" + "apiServerInternalIPs", + "ingressIPs" ], "properties": { - "image": { - "description": "Image is the metadata of that image, if the image was located", - "$ref": "#/definitions/io.openshift.image.v1.Image" + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", + "type": "string" }, - "manifests": { - "description": "Manifests holds sub-manifests metadata when importing a manifest list", + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.Image" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "status": { - "description": "Status is the status of the image import, including errors encountered while retrieving the image", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status" + "cloudName": { + "description": "cloudName is the name of the desired OpenStack cloud in the client configuration file (`clouds.yaml`).", + "type": "string" }, - "tag": { - "description": "Tag is the tag this image was located under, if any", + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", + "type": "string" + }, + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "loadBalancer": { + "description": "loadBalancer defines how the load balancer used by the cluster is configured.", + "default": { + "type": "OpenShiftManagedDefault" + }, + "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformLoadBalancer" + }, + "machineNetworks": { + "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "nodeDNSIP": { + "description": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for OpenStack deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageImportStatus", + "Kind": "OpenStackPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageLayer": { - "description": "ImageLayer represents a single layer of the image. Some images may have multiple layers. Some may have none.", + "io.openshift.config.v1.OperandVersion": { "type": "object", "required": [ "name", - "size", - "mediaType" + "version" ], "properties": { - "mediaType": { - "description": "MediaType of the referenced object.", + "name": { + "description": "name is the name of the particular operand this version is for. It usually matches container images, not operators.", "type": "string", "default": "" }, - "name": { - "description": "Name of the layer as defined by the underlying store.", + "version": { + "description": "version indicates which version of a particular operand is currently being managed. It must always match the Available operand. If 1.0.0 is Available, then this must indicate 1.0.0 even if the operator is trying to rollout 1.1.0", "type": "string", "default": "" - }, - "size": { - "description": "Size of the layer in bytes as defined by the underlying store.", - "type": "integer", - "format": "int64", - "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageLayer", + "Kind": "OperandVersion", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageLayerData": { - "description": "ImageLayerData contains metadata about an image layer.", + "io.openshift.config.v1.OperatorHub": { + "description": "OperatorHub is the Schema for the operatorhubs API. It can be used to change the state of the default hub sources for OperatorHub on the cluster from enabled to disabled and vice versa.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "size", - "mediaType" + "metadata", + "spec", + "status" ], "properties": { - "mediaType": { - "description": "MediaType of the referenced object.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "size": { - "description": "Size of the layer in bytes as defined by the underlying store. This field is optional if the necessary information about size is not available.", - "type": "integer", - "format": "int64" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.OperatorHubSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.OperatorHubStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", + "Type": "object", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageLayerData", - "Scope": "Namespaced" + "Kind": "OperatorHub", + "Scope": "Clustered" } }, - "io.openshift.image.v1.ImageList": { - "description": "ImageList is a list of Image objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.OperatorHubList": { + "description": "OperatorHubList contains a list of OperatorHub\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -28738,11 +29718,10 @@ "type": "string" }, "items": { - "description": "Items is a list of images", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.Image" + "$ref": "#/definitions/io.openshift.config.v1.OperatorHub" } }, "kind": { @@ -28757,583 +29736,493 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageList", + "Kind": "OperatorHubList", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageLookupPolicy": { - "description": "ImageLookupPolicy describes how an image stream can be used to override the image references used by pods, builds, and other resources in a namespace.", + "io.openshift.config.v1.OperatorHubSpec": { + "description": "OperatorHubSpec defines the desired state of OperatorHub", "type": "object", - "required": [ - "local" - ], "properties": { - "local": { - "description": "local will change the docker short image references (like \"mysql\" or \"php:latest\") on objects in this namespace to the image ID whenever they match this image stream, instead of reaching out to a remote registry. The name will be fully qualified to an image ID if found. The tag's referencePolicy is taken into account on the replaced value. Only works within the current namespace.", - "type": "boolean", - "default": false - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "ImageLookupPolicy", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.ImageManifest": { - "description": "ImageManifest represents sub-manifests of a manifest list. The Digest field points to a regular Image object.", - "type": "object", - "required": [ - "digest", - "mediaType", - "manifestSize", - "architecture", - "os" - ], - "properties": { - "architecture": { - "description": "Architecture specifies the supported CPU architecture, for example `amd64` or `ppc64le`.", - "type": "string", - "default": "" - }, - "digest": { - "description": "Digest is the unique identifier for the manifest. It refers to an Image object.", - "type": "string", - "default": "" - }, - "manifestSize": { - "description": "ManifestSize represents the size of the raw object contents, in bytes.", - "type": "integer", - "format": "int64", - "default": 0 - }, - "mediaType": { - "description": "MediaType defines the type of the manifest, possible values are application/vnd.oci.image.manifest.v1+json, application/vnd.docker.distribution.manifest.v2+json or application/vnd.docker.distribution.manifest.v1+json.", - "type": "string", - "default": "" - }, - "os": { - "description": "OS specifies the operating system, for example `linux`.", - "type": "string", - "default": "" + "disableAllDefaultSources": { + "description": "disableAllDefaultSources allows you to disable all the default hub sources. If this is true, a specific entry in sources can be used to enable a default source. If this is false, a specific entry in sources can be used to disable or enable a default source.", + "type": "boolean" }, - "variant": { - "description": "Variant is an optional field repreenting a variant of the CPU, for example v6 to specify a particular CPU variant of the ARM CPU.", - "type": "string" + "sources": { + "description": "sources is the list of default hub sources and their configuration. If the list is empty, it implies that the default hub sources are enabled on the cluster unless disableAllDefaultSources is true. If disableAllDefaultSources is true and sources is not empty, the configuration present in sources will take precedence. The list of default hub sources and their current state will always be reflected in the status block.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.HubSource" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageManifest", + "Kind": "OperatorHubSpec", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageSignature": { - "description": "ImageSignature holds a signature of an image. It allows to verify image identity and possibly other claims as long as the signature is trusted. Based on this information it is possible to restrict runnable images to those matching cluster-wide policy. Mandatory fields should be parsed by clients doing image verification. The others are parsed from signature's content by the server. They serve just an informative purpose.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.OperatorHubStatus": { + "description": "OperatorHubStatus defines the observed state of OperatorHub. The current state of the default hub sources will always be reflected here.", "type": "object", - "required": [ - "type", - "content" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "conditions": { - "description": "Conditions represent the latest available observations of a signature's current state.", + "sources": { + "description": "sources encapsulates the result of applying the configuration for each hub source", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.SignatureCondition" - }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "content": { - "description": "Required: An opaque binary string which is an image's signature.", - "type": "string", - "format": "byte" - }, - "created": { - "description": "If specified, it is the time of signature's creation.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "imageIdentity": { - "description": "A human readable string representing image's identity. It could be a product name and version, or an image pull spec (e.g. \"registry.access.redhat.com/rhel7/rhel:7.2\").", - "type": "string" - }, - "issuedBy": { - "description": "If specified, it holds information about an issuer of signing certificate or key (a person or entity who signed the signing certificate or key).", - "$ref": "#/definitions/io.openshift.image.v1.SignatureIssuer" - }, - "issuedTo": { - "description": "If specified, it holds information about a subject of signing certificate or key (a person or entity who signed the image).", - "$ref": "#/definitions/io.openshift.image.v1.SignatureSubject" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "signedClaims": { - "description": "Contains claims from the signature.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.config.v1.HubSourceStatus" } - }, - "type": { - "description": "Required: Describes a type of stored blob.", - "type": "string", - "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageSignature", - "Scope": "Clustered" + "Kind": "OperatorHubStatus", + "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStream": { - "description": "An ImageStream stores a mapping of tags to images, metadata overrides that are applied when images are tagged in a stream, and an optional reference to a container image repository on a registry. Users typically update the spec.tags field to point to external images which are imported from container registries using credentials in your namespace with the pull secret type, or to existing image stream tags and images which are immediately accessible for tagging or pulling. The history of images applied to a tag is visible in the status.tags field and any user who can view an image stream is allowed to tag that image into their own image streams. Access to pull images from the integrated registry is granted by having the \"get imagestreams/layers\" permission on a given image stream. Users may remove a tag by deleting the imagestreamtag resource, which causes both spec and status for that tag to be removed. Image stream history is retained until an administrator runs the prune operation, which removes references that are no longer in use. To preserve a historical image, ensure there is a tag in spec pointing to that image by its digest.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.OvirtPlatformLoadBalancer": { + "description": "OvirtPlatformLoadBalancer defines the load balancer used by the cluster on Ovirt platform.", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "Spec describes the desired state of this stream", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageStreamSpec" - }, - "status": { - "description": "Status describes the current state of this stream", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageStreamStatus" + "type": { + "description": "type defines the type of load balancer used by the cluster on Ovirt platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", + "type": "string", + "default": "OpenShiftManagedDefault" } }, "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStream", + "Kind": "OvirtPlatformLoadBalancer", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": {} + } + ] + }, + "io.openshift.config.v1.OvirtPlatformSpec": { + "description": "OvirtPlatformSpec holds the desired state of the oVirt infrastructure provider. This only includes fields that can be modified in the cluster.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "OvirtPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamImage": { - "description": "ImageStreamImage represents an Image that is retrieved by image name from an ImageStream. User interfaces and regular users can use this resource to access the metadata details of a tagged image in the image stream history for viewing, since Image resources are not directly accessible to end users. A not found error will be returned if no such image is referenced by a tag within the ImageStream. Images are created when spec tags are set on an image stream that represent an image in an external registry, when pushing to the integrated registry, or when tagging an existing image from one image stream to another. The name of an image stream image is in the form \"\u003cSTREAM\u003e@\u003cDIGEST\u003e\", where the digest is the content addressible identifier for the image (sha256:xxxxx...). You can use ImageStreamImages as the from.kind of an image stream spec tag to reference an image exactly. The only operations supported on the imagestreamimage endpoint are retrieving the image.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.OvirtPlatformStatus": { + "description": "OvirtPlatformStatus holds the current status of the oVirt infrastructure provider.", "type": "object", "required": [ - "image" + "apiServerInternalIPs", + "ingressIPs" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", "type": "string" }, - "image": { - "description": "Image associated with the ImageStream and image name.", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.Image" + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, + "loadBalancer": { + "description": "loadBalancer defines how the load balancer used by the cluster is configured.", + "default": { + "type": "OpenShiftManagedDefault" + }, + "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformLoadBalancer" + }, + "nodeDNSIP": { + "description": "deprecated: as of 4.6, this field is no longer set or honored. It will be removed in a future release.", + "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamImage", + "Kind": "OvirtPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamImport": { - "description": "The image stream import resource provides an easy way for a user to find and import container images from other container image registries into the server. Individual images or an entire image repository may be imported, and users may choose to see the results of the import prior to tagging the resulting images into the specified image stream.\n\nThis API is intended for end-user tools that need to see the metadata of the image prior to import (for instance, to generate an application from it). Clients that know the desired image can continue to create spec.tags directly into their image streams.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.PlatformSpec": { + "description": "PlatformSpec holds the desired state specific to the underlying infrastructure provider of the current cluster. Since these are used at spec-level for the underlying cluster, it is supposed that only one of the spec structs is set.", "type": "object", "required": [ - "spec", - "status" + "type" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "alibabaCloud": { + "description": "AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AlibabaCloudPlatformSpec" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "aws": { + "description": "AWS contains settings specific to the Amazon Web Services infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AWSPlatformSpec" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "azure": { + "description": "Azure contains settings specific to the Azure infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AzurePlatformSpec" }, - "spec": { - "description": "Spec is a description of the images that the user wishes to import", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageStreamImportSpec" + "baremetal": { + "description": "BareMetal contains settings specific to the BareMetal platform.", + "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformSpec" }, - "status": { - "description": "Status is the result of importing the image", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageStreamImportStatus" + "equinixMetal": { + "description": "EquinixMetal contains settings specific to the Equinix Metal infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.EquinixMetalPlatformSpec" + }, + "external": { + "description": "ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately.", + "$ref": "#/definitions/io.openshift.config.v1.ExternalPlatformSpec" + }, + "gcp": { + "description": "GCP contains settings specific to the Google Cloud Platform infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.GCPPlatformSpec" + }, + "ibmcloud": { + "description": "IBMCloud contains settings specific to the IBMCloud infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.IBMCloudPlatformSpec" + }, + "kubevirt": { + "description": "Kubevirt contains settings specific to the kubevirt infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.KubevirtPlatformSpec" + }, + "nutanix": { + "description": "Nutanix contains settings specific to the Nutanix infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformSpec" + }, + "openstack": { + "description": "OpenStack contains settings specific to the OpenStack infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformSpec" + }, + "ovirt": { + "description": "Ovirt contains settings specific to the oVirt infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformSpec" + }, + "powervs": { + "description": "PowerVS contains settings specific to the IBM Power Systems Virtual Servers infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.PowerVSPlatformSpec" + }, + "type": { + "description": "type is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", \"KubeVirt\", \"EquinixMetal\", \"PowerVS\", \"AlibabaCloud\", \"Nutanix\" and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.", + "type": "string", + "default": "" + }, + "vsphere": { + "description": "VSphere contains settings specific to the VSphere infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformSpec" } }, "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamImport", + "Kind": "PlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamImportSpec": { - "description": "ImageStreamImportSpec defines what images should be imported.", + "io.openshift.config.v1.PlatformStatus": { + "description": "PlatformStatus holds the current status specific to the underlying infrastructure provider of the current cluster. Since these are used at status-level for the underlying cluster, it is supposed that only one of the status structs is set.", "type": "object", "required": [ - "import" + "type" ], "properties": { - "images": { - "description": "Images are a list of individual images to import.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageImportSpec" - } + "alibabaCloud": { + "description": "AlibabaCloud contains settings specific to the Alibaba Cloud infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AlibabaCloudPlatformStatus" }, - "import": { - "description": "Import indicates whether to perform an import - if so, the specified tags are set on the spec and status of the image stream defined by the type meta.", - "type": "boolean", - "default": false + "aws": { + "description": "AWS contains settings specific to the Amazon Web Services infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AWSPlatformStatus" }, - "repository": { - "description": "Repository is an optional import of an entire container image repository. A maximum limit on the number of tags imported this way is imposed by the server.", - "$ref": "#/definitions/io.openshift.image.v1.RepositoryImportSpec" + "azure": { + "description": "Azure contains settings specific to the Azure infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.AzurePlatformStatus" + }, + "baremetal": { + "description": "BareMetal contains settings specific to the BareMetal platform.", + "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformStatus" + }, + "equinixMetal": { + "description": "EquinixMetal contains settings specific to the Equinix Metal infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.EquinixMetalPlatformStatus" + }, + "external": { + "description": "External contains settings specific to the generic External infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.ExternalPlatformStatus" + }, + "gcp": { + "description": "GCP contains settings specific to the Google Cloud Platform infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.GCPPlatformStatus" + }, + "ibmcloud": { + "description": "IBMCloud contains settings specific to the IBMCloud infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.IBMCloudPlatformStatus" + }, + "kubevirt": { + "description": "Kubevirt contains settings specific to the kubevirt infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.KubevirtPlatformStatus" + }, + "nutanix": { + "description": "Nutanix contains settings specific to the Nutanix infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformStatus" + }, + "openstack": { + "description": "OpenStack contains settings specific to the OpenStack infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformStatus" + }, + "ovirt": { + "description": "Ovirt contains settings specific to the oVirt infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformStatus" + }, + "powervs": { + "description": "PowerVS contains settings specific to the Power Systems Virtual Servers infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.PowerVSPlatformStatus" + }, + "type": { + "description": "type is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", \"EquinixMetal\", \"PowerVS\", \"AlibabaCloud\", \"Nutanix\" and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.\n\nThis value will be synced with to the `status.platform` and `status.platformStatus.type`. Currently this value cannot be changed once set.", + "type": "string", + "default": "" + }, + "vsphere": { + "description": "VSphere contains settings specific to the VSphere infrastructure provider.", + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformStatus" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamImportSpec", + "Kind": "PlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamImportStatus": { - "description": "ImageStreamImportStatus contains information about the status of an image stream import.", + "io.openshift.config.v1.PowerVSPlatformSpec": { + "description": "PowerVSPlatformSpec holds the desired state of the IBM Power Systems Virtual Servers infrastructure provider. This only includes fields that can be modified in the cluster.", "type": "object", "properties": { - "images": { - "description": "Images is set with the result of importing spec.images", + "serviceEndpoints": { + "description": "serviceEndpoints is a list of custom endpoints which will override the default service endpoints of a Power VS service.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageImportStatus" - } - }, - "import": { - "description": "Import is the image stream that was successfully updated or created when 'to' was set.", - "$ref": "#/definitions/io.openshift.image.v1.ImageStream" - }, - "repository": { - "description": "Repository is set if spec.repository was set to the outcome of the import", - "$ref": "#/definitions/io.openshift.image.v1.RepositoryImportStatus" + "$ref": "#/definitions/io.openshift.config.v1.PowerVSServiceEndpoint" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamImportStatus", + "Kind": "PowerVSPlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamLayers": { - "description": "ImageStreamLayers describes information about the layers referenced by images in this image stream.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.PowerVSPlatformStatus": { + "description": "PowerVSPlatformStatus holds the current status of the IBM Power Systems Virtual Servers infrastrucutre provider.", "type": "object", "required": [ - "blobs", - "images" + "region", + "zone" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "cisInstanceCRN": { + "description": "CISInstanceCRN is the CRN of the Cloud Internet Services instance managing the DNS zone for the cluster's base domain", "type": "string" }, - "blobs": { - "description": "blobs is a map of blob name to metadata about the blob.", - "type": "object", - "additionalProperties": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageLayerData" - } + "dnsInstanceCRN": { + "description": "DNSInstanceCRN is the CRN of the DNS Services instance managing the DNS zone for the cluster's base domain", + "type": "string" }, - "images": { - "description": "images is a map between an image name and the names of the blobs and config that comprise the image.", - "type": "object", - "additionalProperties": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageBlobReferences" - } + "region": { + "description": "region holds the default Power VS region for new Power VS resources created by the cluster.", + "type": "string", + "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "resourceGroup": { + "description": "resourceGroup is the resource group name for new IBMCloud resources created for a cluster. The resource group specified here will be used by cluster-image-registry-operator to set up a COS Instance in IBMCloud for the cluster registry. More about resource groups can be found here: https://cloud.ibm.com/docs/account?topic=account-rgs. When omitted, the image registry operator won't be able to configure storage, which results in the image registry cluster operator not being in an available state.", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "serviceEndpoints": { + "description": "serviceEndpoints is a list of custom endpoints which will override the default service endpoints of a Power VS service.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.PowerVSServiceEndpoint" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + }, + "zone": { + "description": "zone holds the default zone for the new Power VS resources created by the cluster. Note: Currently only single-zone OCP clusters are supported", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamLayers", + "Kind": "PowerVSPlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamList": { - "description": "ImageStreamList is a list of ImageStream objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.PowerVSServiceEndpoint": { + "description": "PowervsServiceEndpoint stores the configuration of a custom url to override existing defaults of PowerVS Services.", "type": "object", "required": [ - "items" + "name", + "url" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "name": { + "description": "name is the name of the Power VS service. Few of the services are IAM - https://cloud.ibm.com/apidocs/iam-identity-token-api ResourceController - https://cloud.ibm.com/apidocs/resource-controller/resource-controller Power Cloud - https://cloud.ibm.com/apidocs/power-cloud", + "type": "string", + "default": "" }, - "items": { - "description": "Items is a list of imageStreams", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageStream" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "url": { + "description": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamList", + "Kind": "PowerVSServiceEndpoint", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamMapping": { - "description": "ImageStreamMapping represents a mapping from a single image stream tag to a container image as well as the reference to the container image stream the image came from. This resource is used by privileged integrators to create an image resource and to associate it with an image stream in the status tags field. Creating an ImageStreamMapping will allow any user who can view the image stream to tag or pull that image, so only create mappings where the user has proven they have access to the image contents directly. The only operation supported for this resource is create and the metadata name and namespace should be set to the image stream containing the tag that should be updated.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.PrefixedClaimMapping": { "type": "object", "required": [ - "image", - "tag" + "claim", + "prefix" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "image": { - "description": "Image is a container image.", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.Image" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "tag": { - "description": "Tag is a string value this image can be located with inside the stream.", + "claim": { + "description": "Claim is a JWT token claim to be used in the mapping", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "ImageStreamMapping", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.ImageStreamSpec": { - "description": "ImageStreamSpec represents options for ImageStreams.", - "type": "object", - "properties": { - "dockerImageRepository": { - "description": "dockerImageRepository is optional, if specified this stream is backed by a container repository on this server Deprecated: This field is deprecated as of v3.7 and will be removed in a future release. Specify the source for the tags to be imported in each tag via the spec.tags.from reference instead.", - "type": "string" - }, - "lookupPolicy": { - "description": "lookupPolicy controls how other resources reference images within this namespace.", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageLookupPolicy" }, - "tags": { - "description": "tags map arbitrary string values to specific image locators", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagReference" - }, - "x-kubernetes-patch-merge-key": "name", - "x-kubernetes-patch-strategy": "merge" + "prefix": { + "description": "Prefix is a string to prefix the value from the token in the result of the claim mapping.\n\nBy default, no prefixing occurs.\n\nExample: if `prefix` is set to \"myoidc:\"\" and the `claim` in JWT contains an array of strings \"a\", \"b\" and \"c\", the mapping will result in an array of string \"myoidc:a\", \"myoidc:b\" and \"myoidc:c\".", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamSpec", + "Kind": "PrefixedClaimMapping", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamStatus": { - "description": "ImageStreamStatus contains information about the state of this image stream.", + "io.openshift.config.v1.ProfileCustomizations": { + "description": "ProfileCustomizations contains various parameters for modifying the default behavior of certain profiles", "type": "object", - "required": [ - "dockerImageRepository" - ], "properties": { - "dockerImageRepository": { - "description": "DockerImageRepository represents the effective location this stream may be accessed at. May be empty until the server determines where the repository is located", + "dynamicResourceAllocation": { + "description": "dynamicResourceAllocation allows to enable or disable dynamic resource allocation within the scheduler. Dynamic resource allocation is an API for requesting and sharing resources between pods and containers inside a pod. Third-party resource drivers are responsible for tracking and allocating resources. Different kinds of resources support arbitrary parameters for defining requirements and initialization. Valid values are Enabled, Disabled and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is Disabled.", "type": "string", "default": "" - }, - "publicDockerImageRepository": { - "description": "PublicDockerImageRepository represents the public location from where the image can be pulled outside the cluster. This field may be empty if the administrator has not exposed the integrated registry externally.", - "type": "string" - }, - "tags": { - "description": "Tags are a historical record of images associated with each tag. The first entry in the TagEvent array is the currently tagged image.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.NamedTagEventList" - }, - "x-kubernetes-patch-merge-key": "tag", - "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamStatus", + "Kind": "ProfileCustomizations", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageStreamTag": { - "description": "ImageStreamTag represents an Image that is retrieved by tag name from an ImageStream. Use this resource to interact with the tags and images in an image stream by tag, or to see the image details for a particular tag. The image associated with this resource is the most recently successfully tagged, imported, or pushed image (as described in the image stream status.tags.items list for this tag). If an import is in progress or has failed the previous image will be shown. Deleting an image stream tag clears both the status and spec fields of an image stream. If no image can be retrieved for a given tag, a not found error will be returned.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.Project": { + "description": "Project holds cluster-wide information about Project. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "tag", - "generation", - "lookupPolicy", - "image" + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "conditions": { - "description": "conditions is an array of conditions that apply to the image stream tag.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagEventCondition" - } - }, - "generation": { - "description": "generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or conditions will be filled out indicating any error.", - "type": "integer", - "format": "int64", - "default": 0 - }, - "image": { - "description": "image associated with the ImageStream and tag.", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.Image" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "lookupPolicy": { - "description": "lookupPolicy indicates whether this tag will handle image references in this namespace.", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageLookupPolicy" - }, "metadata": { "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "tag": { - "description": "tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.", - "$ref": "#/definitions/io.openshift.image.v1.TagReference" + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ProjectSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ProjectStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamTag", - "Scope": "Namespaced" + "Kind": "Project", + "Scope": "Clustered" } }, - "io.openshift.image.v1.ImageStreamTagList": { - "description": "ImageStreamTagList is a list of ImageStreamTag objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ProjectList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -29342,11 +30231,10 @@ "type": "string" }, "items": { - "description": "Items is the list of image stream tags", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageStreamTag" + "$ref": "#/definitions/io.openshift.config.v1.Project" } }, "kind": { @@ -29361,29 +30249,77 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageStreamTagList", + "Kind": "ProjectList", "Scope": "Namespaced" } }, - "io.openshift.image.v1.ImageTag": { - "description": "ImageTag represents a single tag within an image stream and includes the spec, the status history, and the currently referenced image (if any) of the provided tag. This type replaces the ImageStreamTag by providing a full view of the tag. ImageTags are returned for every spec or status tag present on the image stream. If no tag exists in either form a not found error will be returned by the API. A create operation will succeed if no spec tag has already been defined and the spec field is set. Delete will remove both spec and status elements from the image stream.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ProjectSpec": { + "description": "ProjectSpec holds the project creation configuration.", + "type": "object", + "properties": { + "projectRequestMessage": { + "description": "projectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint", + "type": "string", + "default": "" + }, + "projectRequestTemplate": { + "description": "projectRequestTemplate is the template to use for creating projects in response to projectrequest. This must point to a template in 'openshift-config' namespace. It is optional. If it is not specified, a default template is used.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.TemplateReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ProjectSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.ProjectStatus": { + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ProjectStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.PromQLClusterCondition": { + "description": "PromQLClusterCondition represents a cluster condition based on PromQL.", "type": "object", "required": [ - "spec", - "status", - "image" + "promql" + ], + "properties": { + "promql": { + "description": "PromQL is a PromQL query classifying clusters. This query query should return a 1 in the match case and a 0 in the does-not-match case. Queries which return no time series, or which return values besides 0 or 1, are evaluation failures.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "PromQLClusterCondition", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.Proxy": { + "description": "Proxy holds cluster-wide information on how to configure default proxies for the cluster. The canonical name is `cluster`\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "image": { - "description": "image is the details of the most recent image stream status tag, and it may be null if import has not completed or an administrator has deleted the image object. To verify this is the most recent image, you must verify the generation of the most recent status.items entry matches the spec tag (if a spec tag is set). This field will not be set when listing image tags.", - "$ref": "#/definitions/io.openshift.image.v1.Image" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" @@ -29394,26 +30330,29 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.", - "$ref": "#/definitions/io.openshift.image.v1.TagReference" + "description": "Spec holds user-settable values for the proxy configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ProxySpec" }, "status": { - "description": "status is the status tag details associated with this image stream tag, and it may be null if no push or import has been performed.", - "$ref": "#/definitions/io.openshift.image.v1.NamedTagEventList" + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ProxyStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageTag", - "Scope": "Namespaced" + "Kind": "Proxy", + "Scope": "Clustered" } }, - "io.openshift.image.v1.ImageTagList": { - "description": "ImageTagList is a list of ImageTag objects. When listing image tags, the image field is not populated. Tags are returned in alphabetical order by image stream and then tag.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.config.v1.ProxyList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -29422,11 +30361,10 @@ "type": "string" }, "items": { - "description": "Items is the list of image stream tags", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageTag" + "$ref": "#/definitions/io.openshift.config.v1.Proxy" } }, "kind": { @@ -29441,459 +30379,382 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ImageTagList", + "Kind": "ProxyList", "Scope": "Namespaced" } }, - "io.openshift.image.v1.NamedTagEventList": { - "description": "NamedTagEventList relates a tag to its image history.", + "io.openshift.config.v1.ProxySpec": { + "description": "ProxySpec contains cluster proxy creation configuration.", "type": "object", - "required": [ - "tag", - "items" - ], "properties": { - "conditions": { - "description": "Conditions is an array of conditions that apply to the tag event list.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagEventCondition" - } + "httpProxy": { + "description": "httpProxy is the URL of the proxy for HTTP requests. Empty means unset and will not result in an env var.", + "type": "string" }, - "items": { - "description": "Standard object's metadata.", + "httpsProxy": { + "description": "httpsProxy is the URL of the proxy for HTTPS requests. Empty means unset and will not result in an env var.", + "type": "string" + }, + "noProxy": { + "description": "noProxy is a comma-separated list of hostnames and/or CIDRs and/or IPs for which the proxy should not be used. Empty means unset and will not result in an env var.", + "type": "string" + }, + "readinessEndpoints": { + "description": "readinessEndpoints is a list of endpoints used to verify readiness of the proxy.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagEvent" + "type": "string", + "default": "" } }, - "tag": { - "description": "Tag is the tag for which the history is recorded", - "type": "string", - "default": "" + "trustedCA": { + "description": "trustedCA is a reference to a ConfigMap containing a CA certificate bundle. The trustedCA field should only be consumed by a proxy validator. The validator is responsible for reading the certificate bundle from the required key \"ca-bundle.crt\", merging it with the system default trust bundle, and writing the merged trust bundle to a ConfigMap named \"trusted-ca-bundle\" in the \"openshift-config-managed\" namespace. Clients that expect to make proxy connections must use the trusted-ca-bundle for all HTTPS requests to the proxy, and may use the trusted-ca-bundle for non-proxy HTTPS requests as well.\n\nThe namespace for the ConfigMap referenced by trustedCA is \"openshift-config\". Here is an example ConfigMap (in yaml):\n\napiVersion: v1 kind: ConfigMap metadata:\n name: user-ca-bundle\n namespace: openshift-config\n data:\n ca-bundle.crt: |\n -----BEGIN CERTIFICATE-----\n Custom CA certificate bundle.\n -----END CERTIFICATE-----", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "NamedTagEventList", + "Kind": "ProxySpec", "Scope": "Namespaced" } }, - "io.openshift.image.v1.RepositoryImportSpec": { - "description": "RepositoryImportSpec describes a request to import images from a container image repository.", + "io.openshift.config.v1.ProxyStatus": { + "description": "ProxyStatus shows current known state of the cluster proxy.", + "type": "object", + "properties": { + "httpProxy": { + "description": "httpProxy is the URL of the proxy for HTTP requests.", + "type": "string" + }, + "httpsProxy": { + "description": "httpsProxy is the URL of the proxy for HTTPS requests.", + "type": "string" + }, + "noProxy": { + "description": "noProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ProxyStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1.RegistryLocation": { + "description": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.", "type": "object", "required": [ - "from" + "domainName" ], "properties": { - "from": { - "description": "From is the source for the image repository to import; only kind DockerImage and a name of a container image repository is allowed", - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" - }, - "importPolicy": { - "description": "ImportPolicy is the policy controlling how the image is imported", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagImportPolicy" + "domainName": { + "description": "domainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.", + "type": "string", + "default": "" }, - "includeManifest": { - "description": "IncludeManifest determines if the manifest for each image is returned in the response", + "insecure": { + "description": "insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.", "type": "boolean" - }, - "referencePolicy": { - "description": "ReferencePolicy defines how other components should consume the image", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagReferencePolicy" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "RepositoryImportSpec", + "Kind": "RegistryLocation", "Scope": "Namespaced" } }, - "io.openshift.image.v1.RepositoryImportStatus": { - "description": "RepositoryImportStatus describes the result of an image repository import", + "io.openshift.config.v1.RegistrySources": { + "description": "RegistrySources holds cluster-wide information about how to handle the registries config.", "type": "object", "properties": { - "additionalTags": { - "description": "AdditionalTags are tags that exist in the repository but were not imported because a maximum limit of automatic imports was applied.", + "allowedRegistries": { + "description": "allowedRegistries are the only registries permitted for image pull and push actions. All other registries are denied.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, - "images": { - "description": "Images is a list of images successfully retrieved by the import of the repository.", + "blockedRegistries": { + "description": "blockedRegistries cannot be used for image pull and push actions. All other registries are permitted.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.ImageImportStatus" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "status": { - "description": "Status reflects whether any failure occurred during import", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status" + "containerRuntimeSearchRegistries": { + "description": "containerRuntimeSearchRegistries are registries that will be searched when pulling images that do not have fully qualified domains in their pull specs. Registries will be searched in the order provided in the list. Note: this search list only works with the container runtime, i.e CRI-O. Will NOT work with builds or imagestream imports.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, + "insecureRegistries": { + "description": "insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "RepositoryImportStatus", + "Kind": "RegistrySources", "Scope": "Namespaced" } }, - "io.openshift.image.v1.SecretList": { - "description": "SecretList is a list of Secret.", + "io.openshift.config.v1.Release": { + "description": "Release represents an OpenShift release image and associated metadata.", "type": "object", "required": [ - "items" + "version", + "image" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "description": "Items is a list of secret objects. More info: https://kubernetes.io/docs/concepts/configuration/secret", + "channels": { + "description": "channels is the set of Cincinnati channels to which the release currently belongs.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Secret" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "image": { + "description": "image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.", + "type": "string", + "default": "" + }, + "url": { + "description": "url contains information about this release. This URL is set by the 'url' metadata property on a release or the metadata returned by the update API and should be displayed as a link in user interfaces. The URL field may not be set for test or nightly releases.", "type": "string" }, - "metadata": { - "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "version": { + "description": "version is a semantic version identifying the update version. When this field is part of spec, version is optional if image is specified.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", - "Group": "image.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "SecretList", + "Kind": "Release", "Scope": "Namespaced" } }, - "io.openshift.image.v1.SignatureCondition": { - "description": "SignatureCondition describes an image signature condition of particular kind at particular probe time.", + "io.openshift.config.v1.RemoteConnectionInfo": { + "description": "RemoteConnectionInfo holds information necessary for establishing a remote connection", "type": "object", "required": [ - "type", - "status" + "url", + "ca", + "certFile", + "keyFile" ], "properties": { - "lastProbeTime": { - "description": "Last time the condition was checked.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "lastTransitionTime": { - "description": "Last time the condition transit from one status to another.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { - "description": "Human readable message indicating details about last transition.", - "type": "string" - }, - "reason": { - "description": "(brief) reason for the condition's last transition.", - "type": "string" + "ca": { + "description": "CA is the CA for verifying TLS connections", + "type": "string", + "default": "" }, - "status": { - "description": "Status of the condition, one of True, False, Unknown.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "type": { - "description": "Type of signature condition, Complete or Failed.", + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "SignatureCondition", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.SignatureGenericEntity": { - "description": "SignatureGenericEntity holds a generic information about a person or entity who is an issuer or a subject of signing certificate or key.", - "type": "object", - "properties": { - "commonName": { - "description": "Common name (e.g. openshift-signing-service).", - "type": "string" - }, - "organization": { - "description": "Organization name.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "SignatureGenericEntity", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.SignatureIssuer": { - "description": "SignatureIssuer holds information about an issuer of signing certificate or key.", - "type": "object", - "properties": { - "commonName": { - "description": "Common name (e.g. openshift-signing-service).", - "type": "string" }, - "organization": { - "description": "Organization name.", - "type": "string" + "url": { + "description": "URL is the remote URL to connect to", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "SignatureIssuer", + "Kind": "RemoteConnectionInfo", "Scope": "Namespaced" } }, - "io.openshift.image.v1.SignatureSubject": { - "description": "SignatureSubject holds information about a person or entity who created the signature.", + "io.openshift.config.v1.RepositoryDigestMirrors": { + "description": "RepositoryDigestMirrors holds cluster-wide information about how to handle mirrors in the registries config.", "type": "object", "required": [ - "publicKeyID" + "source" ], "properties": { - "commonName": { - "description": "Common name (e.g. openshift-signing-service).", - "type": "string" + "allowMirrorByTags": { + "description": "allowMirrorByTags if true, the mirrors can be used to pull the images that are referenced by their tags. Default is false, the mirrors only work when pulling the images that are referenced by their digests. Pulling images by tag can potentially yield different images, depending on which endpoint we pull from. Forcing digest-pulls for mirrors avoids that issue.", + "type": "boolean" }, - "organization": { - "description": "Organization name.", - "type": "string" + "mirrors": { + "description": "mirrors is zero or more repositories that may also contain the same images. If the \"mirrors\" is not specified, the image will continue to be pulled from the specified repository in the pull spec. No mirror will be configured. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. Other cluster configuration, including (but not limited to) other repositoryDigestMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "publicKeyID": { - "description": "If present, it is a human readable key id of public key belonging to the subject used to verify image signature. It should contain at least 64 lowest bits of public key's fingerprint (e.g. 0x685ebe62bf278440).", + "source": { + "description": "source is the repository that users refer to, e.g. in image pull specifications.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "SignatureSubject", + "Kind": "RepositoryDigestMirrors", "Scope": "Namespaced" } }, - "io.openshift.image.v1.TagEvent": { - "description": "TagEvent is used by ImageStreamStatus to keep a historical record of images associated with a tag.", + "io.openshift.config.v1.RequestHeaderIdentityProvider": { + "description": "RequestHeaderIdentityProvider provides identities for users authenticating using request header credentials", "type": "object", "required": [ - "created", - "dockerImageReference", - "image", - "generation" + "loginURL", + "challengeURL", + "ca", + "headers", + "preferredUsernameHeaders", + "nameHeaders", + "emailHeaders" ], "properties": { - "created": { - "description": "Created holds the time the TagEvent was created", + "ca": { + "description": "ca is a required reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. Specifically, it allows verification of incoming requests to prevent header spoofing. The key \"ca.crt\" is used to locate the data. If the config map or expected key is not found, the identity provider is not honored. If the specified ca data is not valid, the identity provider is not honored. The namespace for this config map is openshift-config.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "dockerImageReference": { - "description": "DockerImageReference is the string that can be used to pull this image", - "type": "string", - "default": "" - }, - "generation": { - "description": "Generation is the spec tag generation that resulted in this tag being updated", - "type": "integer", - "format": "int64", - "default": 0 + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "image": { - "description": "Image is the image", + "challengeURL": { + "description": "challengeURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect WWW-Authenticate challenges will be redirected here. ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}\nRequired when challenge is set to true.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "TagEvent", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.TagEventCondition": { - "description": "TagEventCondition contains condition information for a tag event.", - "type": "object", - "required": [ - "type", - "status", - "generation" - ], - "properties": { - "generation": { - "description": "Generation is the spec tag generation that this status corresponds to", - "type": "integer", - "format": "int64", - "default": 0 - }, - "lastTransitionTime": { - "description": "LastTransitionTIme is the time the condition transitioned from one status to another.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "message": { - "description": "Message is a human readable description of the details about last transition, complementing reason.", - "type": "string" + "clientCommonNames": { + "description": "clientCommonNames is an optional list of common names to require a match from. If empty, any client certificate validated against the clientCA bundle is considered authoritative.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "reason": { - "description": "Reason is a brief machine readable explanation for the condition's last transition.", - "type": "string" + "emailHeaders": { + "description": "emailHeaders is the set of headers to check for the email address", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "status": { - "description": "Status of the condition, one of True, False, Unknown.", - "type": "string", - "default": "" + "headers": { + "description": "headers is the set of headers to check for identity information", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "type": { - "description": "Type of tag event condition, currently only ImportSuccess", + "loginURL": { + "description": "loginURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect interactive logins will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}\nRequired when login is set to true.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "TagEventCondition", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.TagImportPolicy": { - "description": "TagImportPolicy controls how images related to this tag will be imported.", - "type": "object", - "properties": { - "importMode": { - "description": "ImportMode describes how to import an image manifest.", - "type": "string" }, - "insecure": { - "description": "Insecure is true if the server may bypass certificate verification or connect directly over HTTP during image import.", - "type": "boolean" + "nameHeaders": { + "description": "nameHeaders is the set of headers to check for the display name", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "scheduled": { - "description": "Scheduled indicates to the server that this tag should be periodically checked to ensure it is up to date, and imported", - "type": "boolean" + "preferredUsernameHeaders": { + "description": "preferredUsernameHeaders is the set of headers to check for the preferred username", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "TagImportPolicy", + "Kind": "RequestHeaderIdentityProvider", "Scope": "Namespaced" } }, - "io.openshift.image.v1.TagReference": { - "description": "TagReference specifies optional annotations for images using this tag and an optional reference to an ImageStreamTag, ImageStreamImage, or DockerImage this tag should track.", + "io.openshift.config.v1.RequiredHSTSPolicy": { "type": "object", "required": [ - "name" + "domainPatterns", + "maxAge" ], "properties": { - "annotations": { - "description": "Optional; if specified, annotations that are applied to images retrieved via ImageStreamTags.", - "type": "object", - "additionalProperties": { + "domainPatterns": { + "description": "domainPatterns is a list of domains for which the desired HSTS annotations are required. If domainPatterns is specified and a route is created with a spec.host matching one of the domains, the route must specify the HSTS Policy components described in the matching RequiredHSTSPolicy.\n\nThe use of wildcards is allowed like this: *.foo.com matches everything under foo.com. foo.com only matches foo.com, so to cover foo.com and everything under it, you must specify *both*.", + "type": "array", + "items": { "type": "string", "default": "" } }, - "from": { - "description": "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage. ImageStreamTag references can only reference a tag within this same ImageStream.", - "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" - }, - "generation": { - "description": "Generation is a counter that tracks mutations to the spec tag (user intent). When a tag reference is changed the generation is set to match the current stream generation (which is incremented every time spec is changed). Other processes in the system like the image importer observe that the generation of spec tag is newer than the generation recorded in the status and use that as a trigger to import the newest remote tag. To trigger a new import, clients may set this value to zero which will reset the generation to the latest stream generation. Legacy clients will send this value as nil which will be merged with the current tag generation.", - "type": "integer", - "format": "int64" + "includeSubDomainsPolicy": { + "description": "includeSubDomainsPolicy means the HSTS Policy should apply to any subdomains of the host's domain name. Thus, for the host bar.foo.com, if includeSubDomainsPolicy was set to RequireIncludeSubDomains: - the host app.bar.foo.com would inherit the HSTS Policy of bar.foo.com - the host bar.foo.com would inherit the HSTS Policy of bar.foo.com - the host foo.com would NOT inherit the HSTS Policy of bar.foo.com - the host def.foo.com would NOT inherit the HSTS Policy of bar.foo.com", + "type": "string" }, - "importPolicy": { - "description": "ImportPolicy is information that controls how images may be imported by the server.", + "maxAge": { + "description": "maxAge is the delta time range in seconds during which hosts are regarded as HSTS hosts. If set to 0, it negates the effect, and hosts are removed as HSTS hosts. If set to 0 and includeSubdomains is specified, all subdomains of the host are also removed as HSTS hosts. maxAge is a time-to-live value, and if this policy is not refreshed on a client, the HSTS policy will eventually expire on that client.", "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagImportPolicy" - }, - "name": { - "description": "Name of the tag", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.config.v1.MaxAgePolicy" }, - "reference": { - "description": "Reference states if the tag will be imported. Default value is false, which means the tag will be imported.", - "type": "boolean" + "namespaceSelector": { + "description": "namespaceSelector specifies a label selector such that the policy applies only to those routes that are in namespaces with labels that match the selector, and are in one of the DomainPatterns. Defaults to the empty LabelSelector, which matches everything.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "referencePolicy": { - "description": "ReferencePolicy defines how other components should consume the image.", - "default": {}, - "$ref": "#/definitions/io.openshift.image.v1.TagReferencePolicy" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "image.openshift.io", - "Version": "v1", - "Kind": "TagReference", - "Scope": "Namespaced" - } - }, - "io.openshift.image.v1.TagReferencePolicy": { - "description": "TagReferencePolicy describes how pull-specs for images in this image stream tag are generated when image change triggers in deployment configs or builds are resolved. This allows the image stream author to control how images are accessed.", - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "description": "Type determines how the image pull spec should be transformed when the image stream tag is used in deployment config triggers or new builds. The default value is `Source`, indicating the original location of the image should be used (if imported). The user may also specify `Local`, indicating that the pull spec should point to the integrated container image registry and leverage the registry's ability to proxy the pull to an upstream registry. `Local` allows the credentials used to pull this image to be managed from the image stream's namespace, so others on the platform can access a remote image but have no access to the remote secret. It also allows the image layers to be mirrored into the local registry which the images can still be pulled even if the upstream registry is unavailable.", - "type": "string", - "default": "" + "preloadPolicy": { + "description": "preloadPolicy directs the client to include hosts in its host preload list so that it never needs to do an initial load to get the HSTS header (note that this is not defined in RFC 6797 and is therefore client implementation-dependent).", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "image.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "TagReferencePolicy", + "Kind": "RequiredHSTSPolicy", "Scope": "Namespaced" } }, - "io.openshift.insights.v1alpha1.DataGather": { - "description": "DataGather provides data gather configuration options and status for the particular Insights data gathering.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.Scheduler": { + "description": "Scheduler holds cluster-wide config information to run the Kubernetes Scheduler and influence its placement decisions. The canonical name for this config is `cluster`.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -29915,24 +30776,24 @@ "spec": { "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.DataGatherSpec" + "$ref": "#/definitions/io.openshift.config.v1.SchedulerSpec" }, "status": { "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.DataGatherStatus" + "$ref": "#/definitions/io.openshift.config.v1.SchedulerStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "DataGather", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "Scheduler", "Scope": "Clustered" } }, - "io.openshift.insights.v1alpha1.DataGatherList": { - "description": "DataGatherList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.SchedulerList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -29944,11 +30805,10 @@ "type": "string" }, "items": { - "description": "items contains a list of DataGather resources.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.DataGather" + "$ref": "#/definitions/io.openshift.config.v1.Scheduler" } }, "kind": { @@ -29963,1761 +30823,1404 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "DataGatherList", - "Scope": "Namespaced" - } - }, - "io.openshift.insights.v1alpha1.DataGatherSpec": { - "description": "DataGatherSpec contains the configuration for the DataGather.", - "type": "object", - "properties": { - "dataPolicy": { - "description": "dataPolicy allows user to enable additional global obfuscation of the IP addresses and base domain in the Insights archive data. Valid values are \"ClearText\" and \"ObfuscateNetworking\". When set to ClearText the data is not obfuscated. When set to ObfuscateNetworking the IP addresses and the cluster domain name are obfuscated. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is ClearText.", - "type": "string", - "default": "" - }, - "gatherers": { - "description": "gatherers is a list of gatherers configurations. The particular gatherers IDs can be found at https://github.com/openshift/insights-operator/blob/master/docs/gathered-data.md. Run the following command to get the names of last active gatherers: \"oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'\"", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.GathererConfig" - } - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "DataGatherSpec", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "SchedulerList", "Scope": "Namespaced" } }, - "io.openshift.insights.v1alpha1.DataGatherStatus": { - "description": "DataGatherStatus contains information relating to the DataGather state.", + "io.openshift.config.v1.SchedulerSpec": { "type": "object", "properties": { - "conditions": { - "description": "conditions provide details on the status of the gatherer job.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "dataGatherState": { - "description": "dataGatherState reflects the current state of the data gathering process.", + "defaultNodeSelector": { + "description": "defaultNodeSelector helps set the cluster-wide default node selector to restrict pod placement to specific nodes. This is applied to the pods created in all namespaces and creates an intersection with any existing nodeSelectors already set on a pod, additionally constraining that pod's selector. For example, defaultNodeSelector: \"type=user-node,region=east\" would set nodeSelector field in pod spec to \"type=user-node,region=east\" to all pods created in all namespaces. Namespaces having project-wide node selectors won't be impacted even if this field is set. This adds an annotation section to the namespace. For example, if a new namespace is created with node-selector='type=user-node,region=east', the annotation openshift.io/node-selector: type=user-node,region=east gets added to the project. When the openshift.io/node-selector annotation is set on the project the value is used in preference to the value we are setting for defaultNodeSelector field. For instance, openshift.io/node-selector: \"type=user-node,region=west\" means that the default of \"type=user-node,region=east\" set in defaultNodeSelector would not be applied.", "type": "string" }, - "finishTime": { - "description": "finishTime is the time when Insights data gathering finished.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "gatherers": { - "description": "gatherers is a list of active gatherers (and their statuses) in the last gathering.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.GathererStatus" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "mastersSchedulable": { + "description": "MastersSchedulable allows masters nodes to be schedulable. When this flag is turned on, all the master nodes in the cluster will be made schedulable, so that workload pods can run on them. The default value for this field is false, meaning none of the master nodes are schedulable. Important Note: Once the workload pods start running on the master nodes, extreme care must be taken to ensure that cluster-critical control plane components are not impacted. Please turn on this field after doing due diligence.", + "type": "boolean", + "default": false }, - "insightsReport": { - "description": "insightsReport provides general Insights analysis results. When omitted, this means no data gathering has taken place yet or the corresponding Insights analysis (identified by \"insightsRequestID\") is not available.", + "policy": { + "description": "DEPRECATED: the scheduler Policy API has been deprecated and will be removed in a future release. policy is a reference to a ConfigMap containing scheduler policy which has user specified predicates and priorities. If this ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider. The namespace for this configmap is openshift-config.", "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.InsightsReport" + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "insightsRequestID": { - "description": "insightsRequestID is an Insights request ID to track the status of the Insights analysis (in console.redhat.com processing pipeline) for the corresponding Insights data archive.", + "profile": { + "description": "profile sets which scheduling profile should be set in order to configure scheduling decisions for new pods.\n\nValid values are \"LowNodeUtilization\", \"HighNodeUtilization\", \"NoScoring\" Defaults to \"LowNodeUtilization\"", "type": "string" }, - "relatedObjects": { - "description": "relatedObjects is a list of resources which are useful when debugging or inspecting the data gathering Pod", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.ObjectReference" - } - }, - "startTime": { - "description": "startTime is the time when Insights data gathering started.", + "profileCustomizations": { + "description": "profileCustomizations contains configuration for modifying the default behavior of existing scheduler profiles.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "$ref": "#/definitions/io.openshift.config.v1.ProfileCustomizations" } }, "x-fabric8-info": { "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "DataGatherStatus", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "SchedulerSpec", "Scope": "Namespaced" } }, - "io.openshift.insights.v1alpha1.GathererConfig": { - "description": "gathererConfig allows to configure specific gatherers", + "io.openshift.config.v1.SchedulerStatus": { "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "description": "name is the name of specific gatherer", - "type": "string", - "default": "" - }, - "state": { - "description": "state allows you to configure specific gatherer. Valid values are \"Enabled\", \"Disabled\" and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default. The current default is Enabled.", - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "GathererConfig", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "SchedulerStatus", "Scope": "Namespaced" } }, - "io.openshift.insights.v1alpha1.GathererStatus": { - "description": "gathererStatus represents information about a particular data gatherer.", + "io.openshift.config.v1.SecretNameReference": { + "description": "SecretNameReference references a secret in a specific namespace. The namespace must be specified at the point of use.", "type": "object", "required": [ - "conditions", - "name", - "lastGatherDuration" + "name" ], "properties": { - "conditions": { - "description": "conditions provide details on the status of each gatherer.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "lastGatherDuration": { - "description": "lastGatherDuration represents the time spent gathering.", - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, "name": { - "description": "name is the name of the gatherer.", + "description": "name is the metadata.name of the referenced secret", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "GathererStatus", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "SecretNameReference", "Scope": "Namespaced" } }, - "io.openshift.insights.v1alpha1.HealthCheck": { - "description": "healthCheck represents an Insights health check attributes.", + "io.openshift.config.v1.ServingInfo": { + "description": "ServingInfo holds information about serving web pages", "type": "object", "required": [ - "description", - "totalRisk", - "advisorURI", - "state" + "bindAddress", + "bindNetwork", + "certFile", + "keyFile" ], "properties": { - "advisorURI": { - "description": "advisorURI provides the URL link to the Insights Advisor.", + "bindAddress": { + "description": "BindAddress is the ip:port to serve on", "type": "string", "default": "" }, - "description": { - "description": "description provides basic description of the healtcheck.", + "bindNetwork": { + "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", "type": "string", "default": "" }, - "state": { - "description": "state determines what the current state of the health check is. Health check is enabled by default and can be disabled by the user in the Insights advisor user interface.", + "certFile": { + "description": "CertFile is a file containing a PEM-encoded certificate", "type": "string", "default": "" }, - "totalRisk": { - "description": "totalRisk of the healthcheck. Indicator of the total risk posed by the detected issue; combination of impact and likelihood. The values can be from 1 to 4, and the higher the number, the more important the issue.", - "type": "integer", - "format": "int32", - "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "HealthCheck", - "Scope": "Namespaced" - } - }, - "io.openshift.insights.v1alpha1.InsightsReport": { - "description": "insightsReport provides Insights health check report based on the most recently sent Insights data.", - "type": "object", - "properties": { - "downloadedAt": { - "description": "downloadedAt is the time when the last Insights report was downloaded. An empty value means that there has not been any Insights report downloaded yet and it usually appears in disconnected clusters (or clusters when the Insights data gathering is disabled).", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "healthChecks": { - "description": "healthChecks provides basic information about active Insights health checks in a cluster.", + "cipherSuites": { + "description": "CipherSuites contains an overridden list of ciphers for the server to support. Values must match cipher suite IDs from https://golang.org/pkg/crypto/tls/#pkg-constants", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.insights.v1alpha1.HealthCheck" - }, - "x-kubernetes-list-type": "atomic" + "type": "string", + "default": "" + } }, - "uri": { - "description": "uri provides the URL link from which the report was downloaded.", + "clientCA": { + "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", + "type": "string" + }, + "keyFile": { + "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "type": "string", + "default": "" + }, + "minTLSVersion": { + "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", "type": "string" + }, + "namedCertificates": { + "description": "NamedCertificates is a list of certificates to use to secure requests to specific hostnames", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.NamedCertificate" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "InsightsReport", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "ServingInfo", "Scope": "Namespaced" } }, - "io.openshift.insights.v1alpha1.ObjectReference": { - "description": "ObjectReference contains enough information to let you inspect or modify the referred object.", + "io.openshift.config.v1.SignatureStore": { + "description": "SignatureStore represents the URL of custom Signature Store", "type": "object", "required": [ - "group", - "resource", - "name" + "url" ], "properties": { - "group": { - "description": "group is the API Group of the Resource. Enter empty string for the core group. This value should consist of only lowercase alphanumeric characters, hyphens and periods. Example: \"\", \"apps\", \"build.openshift.io\", etc.", - "type": "string", - "default": "" - }, - "name": { - "description": "name of the referent.", - "type": "string", - "default": "" - }, - "namespace": { - "description": "namespace of the referent.", - "type": "string" + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca.crt\" is used to locate the data. If specified and the config map or expected key is not found, the signature store is not honored. If the specified ca data is not valid, the signature store is not honored. If empty, we fall back to the CA configured via Proxy, which is appended to the default system roots. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" }, - "resource": { - "description": "resource is the type that is being referenced. It is normally the plural form of the resource kind in lowercase. This value should consist of only lowercase alphanumeric characters and hyphens. Example: \"deployments\", \"deploymentconfigs\", \"pods\", etc.", + "url": { + "description": "url contains the upstream custom signature store URL. url should be a valid absolute http/https URI of an upstream signature store as per rfc1738. This must be provided and cannot be empty.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "insights.openshift.io", - "Version": "v1alpha1", - "Kind": "ObjectReference", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "SignatureStore", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.AggregatorConfig": { - "description": "AggregatorConfig holds information required to make the aggregator function.", + "io.openshift.config.v1.StringSource": { + "description": "StringSource allows specifying a string inline, or externally via env var or file. When it contains only a string value, it marshals to a simple JSON string.", "type": "object", "required": [ - "proxyClientInfo" + "value", + "env", + "file", + "keyFile" ], "properties": { - "proxyClientInfo": { - "description": "proxyClientInfo specifies the client cert/key to use when proxying to aggregated API servers", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.CertInfo" + "env": { + "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", + "type": "string", + "default": "" + }, + "file": { + "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", + "type": "string", + "default": "" + }, + "keyFile": { + "description": "KeyFile references a file containing the key to use to decrypt the value.", + "type": "string", + "default": "" + }, + "value": { + "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AggregatorConfig", + "Kind": "StringSource", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.KubeAPIServerConfig": { - "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.StringSourceSpec": { + "description": "StringSourceSpec specifies a string value, or external location", "type": "object", "required": [ - "servingInfo", - "corsAllowedOrigins", - "auditConfig", - "storageConfig", - "admission", - "kubeClientConfig", - "authConfig", - "aggregatorConfig", - "kubeletClientInfo", - "servicesSubnet", - "servicesNodePortRange", - "consolePublicURL", - "userAgentMatchingConfig", - "imagePolicyConfig", - "projectConfig", - "serviceAccountPublicKeyFiles", - "oauthConfig", - "apiServerArguments" + "value", + "env", + "file", + "keyFile" ], "properties": { - "admission": { - "description": "admissionConfig holds information about how to configure admission.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" - }, - "aggregatorConfig": { - "description": "aggregatorConfig has options for configuring the aggregator component of the API server.", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.AggregatorConfig" - }, - "apiServerArguments": { - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "auditConfig": { - "description": "auditConfig describes how to configure audit information", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" - }, - "authConfig": { - "description": "authConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.MasterAuthConfig" - }, - "consolePublicURL": { - "description": "DEPRECATED: consolePublicURL has been deprecated and setting it has no effect.", + "env": { + "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", "type": "string", "default": "" }, - "corsAllowedOrigins": { - "description": "corsAllowedOrigins", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "imagePolicyConfig": { - "description": "imagePolicyConfig feeds the image policy admission plugin", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.KubeAPIServerImagePolicyConfig" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "kubeClientConfig": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" - }, - "kubeletClientInfo": { - "description": "kubeletClientInfo contains information about how to connect to kubelets", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.KubeletConnectionInfo" - }, - "oauthConfig": { - "description": "oauthConfig, if present start the /oauth endpoint in this process", - "$ref": "#/definitions/io.openshift.osin.v1.OAuthConfig" - }, - "projectConfig": { - "description": "projectConfig feeds an admission plugin", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.KubeAPIServerProjectConfig" - }, - "serviceAccountPublicKeyFiles": { - "description": "serviceAccountPublicKeyFiles is a list of files, each containing a PEM-encoded public RSA key. (If any file contains a private key, the public portion of the key is used) The list of public keys is used to verify presented service account tokens. Each key is tried in order until the list is exhausted or verification succeeds. If no keys are specified, no service account authentication will be available.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "servicesNodePortRange": { - "description": "servicesNodePortRange is the range to use for assigning service public ports on a host.", + "file": { + "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", "type": "string", "default": "" }, - "servicesSubnet": { - "description": "servicesSubnet is the subnet to use for assigning service IPs", + "keyFile": { + "description": "KeyFile references a file containing the key to use to decrypt the value.", "type": "string", "default": "" }, - "servingInfo": { - "description": "servingInfo describes how to start serving", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" - }, - "storageConfig": { - "description": "storageConfig contains information about how to use", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" - }, - "userAgentMatchingConfig": { - "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.UserAgentMatchingConfig" + "value": { + "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "kubecontrolplane.config.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "KubeAPIServerConfig", + "Kind": "StringSourceSpec", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.KubeAPIServerImagePolicyConfig": { + "io.openshift.config.v1.TLSProfileSpec": { + "description": "TLSProfileSpec is the desired behavior of a TLSSecurityProfile.", "type": "object", "required": [ - "internalRegistryHostname", - "externalRegistryHostnames" + "ciphers", + "minTLSVersion" ], "properties": { - "externalRegistryHostnames": { - "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "ciphers": { + "description": "ciphers is used to specify the cipher algorithms that are negotiated during the TLS handshake. Operators may remove entries their operands do not support. For example, to use DES-CBC3-SHA (yaml):\n\n ciphers:\n - DES-CBC3-SHA", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, - "internalRegistryHostname": { - "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.", + "minTLSVersion": { + "description": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n minTLSVersion: VersionTLS11\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "KubeAPIServerImagePolicyConfig", + "Kind": "TLSProfileSpec", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.KubeAPIServerProjectConfig": { + "io.openshift.config.v1.TLSSecurityProfile": { + "description": "TLSSecurityProfile defines the schema for a TLS security profile. This object is used by operators to apply TLS security settings to operands.", "type": "object", - "required": [ - "defaultNodeSelector" - ], "properties": { - "defaultNodeSelector": { - "description": "defaultNodeSelector holds default project node label selector", + "custom": { + "description": "custom is a user-defined TLS security profile. Be extremely careful using a custom profile as invalid configurations can be catastrophic. An example custom profile looks like this:\n\n ciphers:\n\n - ECDHE-ECDSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-AES128-GCM-SHA256\n\n - ECDHE-ECDSA-AES128-GCM-SHA256\n\n minTLSVersion: VersionTLS11", + "$ref": "#/definitions/io.openshift.config.v1.CustomTLSProfile" + }, + "intermediate": { + "description": "intermediate is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29\n\nand looks like this (yaml):\n\n ciphers:\n\n - TLS_AES_128_GCM_SHA256\n\n - TLS_AES_256_GCM_SHA384\n\n - TLS_CHACHA20_POLY1305_SHA256\n\n - ECDHE-ECDSA-AES128-GCM-SHA256\n\n - ECDHE-RSA-AES128-GCM-SHA256\n\n - ECDHE-ECDSA-AES256-GCM-SHA384\n\n - ECDHE-RSA-AES256-GCM-SHA384\n\n - ECDHE-ECDSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-CHACHA20-POLY1305\n\n - DHE-RSA-AES128-GCM-SHA256\n\n - DHE-RSA-AES256-GCM-SHA384\n\n minTLSVersion: VersionTLS12", + "$ref": "#/definitions/io.openshift.config.v1.IntermediateTLSProfile" + }, + "modern": { + "description": "modern is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility\n\nand looks like this (yaml):\n\n ciphers:\n\n - TLS_AES_128_GCM_SHA256\n\n - TLS_AES_256_GCM_SHA384\n\n - TLS_CHACHA20_POLY1305_SHA256\n\n minTLSVersion: VersionTLS13", + "$ref": "#/definitions/io.openshift.config.v1.ModernTLSProfile" + }, + "old": { + "description": "old is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility\n\nand looks like this (yaml):\n\n ciphers:\n\n - TLS_AES_128_GCM_SHA256\n\n - TLS_AES_256_GCM_SHA384\n\n - TLS_CHACHA20_POLY1305_SHA256\n\n - ECDHE-ECDSA-AES128-GCM-SHA256\n\n - ECDHE-RSA-AES128-GCM-SHA256\n\n - ECDHE-ECDSA-AES256-GCM-SHA384\n\n - ECDHE-RSA-AES256-GCM-SHA384\n\n - ECDHE-ECDSA-CHACHA20-POLY1305\n\n - ECDHE-RSA-CHACHA20-POLY1305\n\n - DHE-RSA-AES128-GCM-SHA256\n\n - DHE-RSA-AES256-GCM-SHA384\n\n - DHE-RSA-CHACHA20-POLY1305\n\n - ECDHE-ECDSA-AES128-SHA256\n\n - ECDHE-RSA-AES128-SHA256\n\n - ECDHE-ECDSA-AES128-SHA\n\n - ECDHE-RSA-AES128-SHA\n\n - ECDHE-ECDSA-AES256-SHA384\n\n - ECDHE-RSA-AES256-SHA384\n\n - ECDHE-ECDSA-AES256-SHA\n\n - ECDHE-RSA-AES256-SHA\n\n - DHE-RSA-AES128-SHA256\n\n - DHE-RSA-AES256-SHA256\n\n - AES128-GCM-SHA256\n\n - AES256-GCM-SHA384\n\n - AES128-SHA256\n\n - AES256-SHA256\n\n - AES128-SHA\n\n - AES256-SHA\n\n - DES-CBC3-SHA\n\n minTLSVersion: VersionTLS10", + "$ref": "#/definitions/io.openshift.config.v1.OldTLSProfile" + }, + "type": { + "description": "type is one of Old, Intermediate, Modern or Custom. Custom provides the ability to specify individual TLS security profile parameters. Old, Intermediate and Modern are TLS security profiles based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations\n\nThe profiles are intent based, so they may change over time as new ciphers are developed and existing ciphers are found to be insecure. Depending on precisely which ciphers are available to a process, the list may be reduced.\n\nNote that the Modern profile is currently not supported because it is not yet well adopted by common software libraries.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "KubeAPIServerProjectConfig", + "Kind": "TLSSecurityProfile", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "custom": "Custom", + "intermediate": "Intermediate", + "modern": "Modern", + "old": "Old" + } + } + ] }, - "io.openshift.kubecontrolplane.v1.KubeControllerManagerConfig": { - "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.TemplateReference": { + "description": "TemplateReference references a template in a specific namespace. The namespace must be specified at the point of use.", "type": "object", "required": [ - "serviceServingCert", - "projectConfig", - "extendedArguments" + "name" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "extendedArguments": { - "description": "extendedArguments is used to configure the kube-controller-manager", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "projectConfig": { - "description": "projectConfig is an optimization for the daemonset controller", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.KubeControllerManagerProjectConfig" - }, - "serviceServingCert": { - "description": "serviceServingCert provides support for the old alpha service serving cert signer CA bundle", - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.ServiceServingCert" + "name": { + "description": "name is the metadata.name of the referenced project request template", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "kubecontrolplane.config.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "KubeControllerManagerConfig", + "Kind": "TemplateReference", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.KubeControllerManagerProjectConfig": { + "io.openshift.config.v1.TestDetails": { "type": "object", "required": [ - "defaultNodeSelector" + "testName" ], "properties": { - "defaultNodeSelector": { - "description": "defaultNodeSelector holds default project node label selector", + "testName": { + "description": "TestName is the name of the test as it appears in junit XMLs. It does not include the suite name since the same test can be executed in many suites.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "KubeControllerManagerProjectConfig", + "Kind": "TestDetails", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.KubeletConnectionInfo": { - "description": "KubeletConnectionInfo holds information necessary for connecting to a kubelet", + "io.openshift.config.v1.TestReporting": { + "description": "TestReporting is used for origin (and potentially others) to report the test names for a given FeatureGate into the payload for later analysis on a per-payload basis. This doesn't need any CRD because it's never stored in the cluster.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "port", - "ca", - "certFile", - "keyFile" + "spec" ], "properties": { - "ca": { - "description": "ca is the CA for verifying TLS connections to kubelets", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "port": { - "description": "port is the port to connect to kubelets on", - "type": "integer", - "format": "int64", - "default": 0 + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.TestReportingSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.TestReportingStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Type": "object", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "KubeletConnectionInfo", + "Kind": "TestReporting", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.MasterAuthConfig": { - "description": "MasterAuthConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", + "io.openshift.config.v1.TestReportingSpec": { "type": "object", "required": [ - "requestHeader", - "webhookTokenAuthenticators", - "oauthMetadataFile" + "testsForFeatureGates" ], "properties": { - "oauthMetadataFile": { - "description": "oauthMetadataFile is a path to a file containing the discovery endpoint for OAuth 2.0 Authorization Server Metadata for an external OAuth server. See IETF Draft: // https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 This option is mutually exclusive with OAuthConfig", - "type": "string", - "default": "" - }, - "requestHeader": { - "description": "requestHeader holds options for setting up a front proxy against the API. It is optional.", - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.RequestHeaderAuthenticationOptions" - }, - "webhookTokenAuthenticators": { - "description": "webhookTokenAuthenticators, if present configures remote token reviewers", + "testsForFeatureGates": { + "description": "TestsForFeatureGates is a list, indexed by FeatureGate and includes information about testing.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.WebhookTokenAuthenticator" + "$ref": "#/definitions/io.openshift.config.v1.FeatureGateTests" } } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "MasterAuthConfig", + "Kind": "TestReportingSpec", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.RequestHeaderAuthenticationOptions": { - "description": "RequestHeaderAuthenticationOptions provides options for setting up a front proxy against the entire API instead of against the /oauth endpoint.", + "io.openshift.config.v1.TestReportingStatus": { "type": "object", - "required": [ - "clientCA", - "clientCommonNames", - "usernameHeaders", - "groupHeaders", - "extraHeaderPrefixes" - ], - "properties": { - "clientCA": { - "description": "clientCA is a file with the trusted signer certs. It is required.", - "type": "string", - "default": "" - }, - "clientCommonNames": { - "description": "clientCommonNames is a required list of common names to require a match from.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "extraHeaderPrefixes": { - "description": "extraHeaderPrefixes is the set of request header prefixes to inspect for user extra. X-Remote-Extra- is suggested.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "groupHeaders": { - "description": "groupHeaders is the set of headers to check for group information. All are unioned.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "usernameHeaders": { - "description": "usernameHeaders is the list of headers to check for user information. First hit wins.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "RequestHeaderAuthenticationOptions", + "Kind": "TestReportingStatus", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.ServiceServingCert": { - "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", + "io.openshift.config.v1.TokenClaimMapping": { "type": "object", "required": [ - "certFile" + "claim" ], "properties": { - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "claim": { + "description": "Claim is a JWT token claim to be used in the mapping", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ServiceServingCert", + "Kind": "TokenClaimMapping", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.UserAgentDenyRule": { - "description": "UserAgentDenyRule adds a rejection message that can be used to help a user figure out how to get an approved client", + "io.openshift.config.v1.TokenClaimMappings": { "type": "object", - "required": [ - "regex", - "httpVerbs", - "rejectionMessage" - ], "properties": { - "httpVerbs": { - "description": "httpVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "regex": { - "description": "regex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", - "type": "string", - "default": "" + "groups": { + "description": "Groups is a name of the claim that should be used to construct groups for the cluster identity. The referenced claim must use array of strings values.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.PrefixedClaimMapping" }, - "rejectionMessage": { - "description": "RejectionMessage is the message shown when rejecting a client. If it is not a set, the default message is used.", - "type": "string", - "default": "" + "username": { + "description": "Username is a name of the claim that should be used to construct usernames for the cluster identity.\n\nDefault value: \"sub\"", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.UsernameClaimMapping" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "UserAgentDenyRule", + "Kind": "TokenClaimMappings", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.UserAgentMatchRule": { - "description": "UserAgentMatchRule describes how to match a given request based on User-Agent and HTTPVerb", + "io.openshift.config.v1.TokenClaimValidationRule": { "type": "object", "required": [ - "regex", - "httpVerbs" + "type", + "requiredClaim" ], "properties": { - "httpVerbs": { - "description": "httpVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "requiredClaim": { + "description": "RequiredClaim allows configuring a required claim name and its expected value", + "$ref": "#/definitions/io.openshift.config.v1.TokenRequiredClaim" }, - "regex": { - "description": "regex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", + "type": { + "description": "Type sets the type of the validation rule", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "UserAgentMatchRule", + "Kind": "TokenClaimValidationRule", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.UserAgentMatchingConfig": { - "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", + "io.openshift.config.v1.TokenConfig": { + "description": "TokenConfig holds the necessary configuration options for authorization and access tokens", "type": "object", - "required": [ - "requiredClients", - "deniedClients", - "defaultRejectionMessage" - ], "properties": { - "defaultRejectionMessage": { - "description": "defaultRejectionMessage is the message shown when rejecting a client. If it is not a set, a generic message is given.", - "type": "string", - "default": "" + "accessTokenInactivityTimeout": { + "description": "accessTokenInactivityTimeout defines the token inactivity timeout for tokens granted by any client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. Takes valid time duration string such as \"5m\", \"1.5h\" or \"2h45m\". The minimum allowed value for duration is 300s (5 minutes). If the timeout is configured per client, then that value takes precedence. If the timeout value is not specified and the client does not override the value, then tokens are valid until their lifetime.\n\nWARNING: existing tokens' timeout will not be affected (lowered) by changing this value", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "deniedClients": { - "description": "deniedClients if this list is non-empty, then a User-Agent must not match any of the UserAgentRegexes", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.UserAgentDenyRule" - } + "accessTokenInactivityTimeoutSeconds": { + "description": "accessTokenInactivityTimeoutSeconds - DEPRECATED: setting this field has no effect.", + "type": "integer", + "format": "int32" }, - "requiredClients": { - "description": "requiredClients if this list is non-empty, then a User-Agent must match one of the UserAgentRegexes to be allowed", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.kubecontrolplane.v1.UserAgentMatchRule" - } + "accessTokenMaxAgeSeconds": { + "description": "accessTokenMaxAgeSeconds defines the maximum age of access tokens", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "UserAgentMatchingConfig", + "Kind": "TokenConfig", "Scope": "Namespaced" } }, - "io.openshift.kubecontrolplane.v1.WebhookTokenAuthenticator": { - "description": "WebhookTokenAuthenticators holds the necessary configuation options for external token authenticators", + "io.openshift.config.v1.TokenIssuer": { "type": "object", "required": [ - "configFile", - "cacheTTL" + "issuerURL", + "audiences", + "issuerCertificateAuthority" ], "properties": { - "cacheTTL": { - "description": "cacheTTL indicates how long an authentication result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get a default timeout of 2 minutes. If zero (e.g. \"0m\"), caching is disabled", - "type": "string", - "default": "" + "audiences": { + "description": "Audiences is an array of audiences that the token was issued for. Valid tokens must include at least one of these values in their \"aud\" claim. Must be set to exactly one value.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "configFile": { - "description": "configFile is a path to a Kubeconfig file with the webhook configuration", + "issuerCertificateAuthority": { + "description": "CertificateAuthority is a reference to a config map in the configuration namespace. The .data of the configMap must contain the \"ca-bundle.crt\" key. If unset, system trust is used instead.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "issuerURL": { + "description": "URL is the serving URL of the token issuer. Must use the https:// scheme.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "kubecontrolplane.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "WebhookTokenAuthenticator", + "Kind": "TokenIssuer", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ActiveDirectoryConfig": { - "description": "ActiveDirectoryConfig holds the necessary configuration options to define how an LDAP group sync interacts with an LDAP server using the Active Directory schema", + "io.openshift.config.v1.TokenRequiredClaim": { "type": "object", "required": [ - "usersQuery", - "userNameAttributes", - "groupMembershipAttributes" + "claim", + "requiredValue" ], "properties": { - "groupMembershipAttributes": { - "description": "GroupMembershipAttributes defines which attributes on an LDAP user entry will be interpreted as the groups it is a member of", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "userNameAttributes": { - "description": "UserNameAttributes defines which attributes on an LDAP user entry will be interpreted as its OpenShift user name.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "claim": { + "description": "Claim is a name of a required claim. Only claims with string values are supported.", + "type": "string", + "default": "" }, - "usersQuery": { - "description": "AllUsersQuery holds the template for an LDAP query that returns user entries.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LDAPQuery" + "requiredValue": { + "description": "RequiredValue is the required value for the claim.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ActiveDirectoryConfig", + "Kind": "TokenRequiredClaim", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.AdmissionConfig": { - "description": "AdmissionConfig holds the necessary configuration options for admission", + "io.openshift.config.v1.Update": { + "description": "Update represents an administrator update request.", "type": "object", - "required": [ - "pluginConfig" - ], "properties": { - "pluginConfig": { - "description": "PluginConfig allows specifying a configuration file per admission control plugin", - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/io.openshift.legacyconfig.v1.AdmissionPluginConfig" - } + "architecture": { + "description": "architecture is an optional field that indicates the desired value of the cluster architecture. In this context cluster architecture means either a single architecture or a multi architecture. architecture can only be set to Multi thereby only allowing updates from single to multi architecture. If architecture is set, image cannot be set and version must be set. Valid values are 'Multi' and empty.", + "type": "string", + "default": "" }, - "pluginOrderOverride": { - "description": "PluginOrderOverride is a list of admission control plugin names that will be installed on the master. Order is significant. If empty, a default list of plugins is used.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "force": { + "description": "force allows an administrator to update to an image that has failed verification or upgradeable checks. This option should only be used when the authenticity of the provided image has been verified out of band because the provided image will run with full administrative access to the cluster. Do not use this flag with images that comes from unknown or potentially malicious sources.", + "type": "boolean", + "default": false + }, + "image": { + "description": "image is a container image location that contains the update. image should be used when the desired version does not exist in availableUpdates or history. When image is set, version is ignored. When image is set, version should be empty. When image is set, architecture cannot be specified.", + "type": "string", + "default": "" + }, + "version": { + "description": "version is a semantic version identifying the update version. version is ignored if image is specified and required if architecture is specified.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AdmissionConfig", + "Kind": "Update", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.AdmissionPluginConfig": { - "description": "AdmissionPluginConfig holds the necessary configuration options for admission plugins", + "io.openshift.config.v1.UpdateHistory": { + "description": "UpdateHistory is a single attempted update to the cluster.", "type": "object", "required": [ - "location", - "configuration" + "state", + "startedTime", + "completionTime", + "image", + "verified" ], "properties": { - "configuration": { - "description": "Configuration is an embedded configuration object to be used as the plugin's configuration. If present, it will be used instead of the path to the configuration file.", + "acceptedRisks": { + "description": "acceptedRisks records risks which were accepted to initiate the update. For example, it may menition an Upgradeable=False or missing signature that was overriden via desiredUpdate.force, or an update that was initiated despite not being in the availableUpdates set of recommended update targets.", + "type": "string" + }, + "completionTime": { + "description": "completionTime, if set, is when the update was fully applied. The update that is currently being applied will have a null completion time. Completion time will always be set for entries that are not the current update (usually to the started time of the next update).", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "image": { + "description": "image is a container image location that contains the update. This value is always populated.", + "type": "string", + "default": "" + }, + "startedTime": { + "description": "startedTime is the time at which the update was started.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "location": { - "description": "Location is the path to a configuration file that contains the plugin's configuration", + "state": { + "description": "state reflects whether the update was fully applied. The Partial state indicates the update is not fully applied, while the Completed state indicates the update was successfully rolled out at least once (all parts of the update successfully applied).", + "type": "string", + "default": "" + }, + "verified": { + "description": "verified indicates whether the provided update was properly verified before it was installed. If this is false the cluster may not be trusted. Verified does not cover upgradeable checks that depend on the cluster state at the time when the update target was accepted.", + "type": "boolean", + "default": false + }, + "version": { + "description": "version is a semantic version identifying the update version. If the requested image does not define a version, or if a failure occurs retrieving the image, this value may be empty.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AdmissionPluginConfig", + "Kind": "UpdateHistory", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.AggregatorConfig": { - "description": "AggregatorConfig holds information required to make the aggregator function.", + "io.openshift.config.v1.UsernameClaimMapping": { "type": "object", "required": [ - "proxyClientInfo" + "claim", + "prefixPolicy", + "prefix" ], "properties": { - "proxyClientInfo": { - "description": "ProxyClientInfo specifies the client cert/key to use when proxying to aggregated API servers", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.CertInfo" + "claim": { + "description": "Claim is a JWT token claim to be used in the mapping", + "type": "string", + "default": "" + }, + "prefix": { + "$ref": "#/definitions/io.openshift.config.v1.UsernamePrefix" + }, + "prefixPolicy": { + "description": "PrefixPolicy specifies how a prefix should apply.\n\nBy default, claims other than `email` will be prefixed with the issuer URL to prevent naming clashes with other plugins.\n\nSet to \"NoPrefix\" to disable prefixing.\n\nExample:\n (1) `prefix` is set to \"myoidc:\" and `claim` is set to \"username\".\n If the JWT claim `username` contains value `userA`, the resulting\n mapped value will be \"myoidc:userA\".\n (2) `prefix` is set to \"myoidc:\" and `claim` is set to \"email\". If the\n JWT `email` claim contains value \"userA@myoidc.tld\", the resulting\n mapped value will be \"myoidc:userA@myoidc.tld\".\n (3) `prefix` is unset, `issuerURL` is set to `https://myoidc.tld`,\n the JWT claims include \"username\":\"userA\" and \"email\":\"userA@myoidc.tld\",\n and `claim` is set to:\n (a) \"username\": the mapped value will be \"https://myoidc.tld#userA\"\n (b) \"email\": the mapped value will be \"userA@myoidc.tld\"", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AggregatorConfig", + "Kind": "UsernameClaimMapping", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.AllowAllPasswordIdentityProvider": { - "description": "AllowAllPasswordIdentityProvider provides identities for users authenticating using non-empty passwords\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.UsernamePrefix": { "type": "object", + "required": [ + "prefixString" + ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "prefixString": { + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AllowAllPasswordIdentityProvider", + "Kind": "UsernamePrefix", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.AuditConfig": { - "description": "AuditConfig holds configuration for the audit capabilities", + "io.openshift.config.v1.VSpherePlatformFailureDomainSpec": { + "description": "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.", "type": "object", "required": [ - "enabled", - "auditFilePath", - "maximumFileRetentionDays", - "maximumRetainedFiles", - "maximumFileSizeMegabytes", - "policyFile", - "policyConfiguration", - "logFormat", - "webHookKubeConfig", - "webHookMode" + "name", + "region", + "zone", + "server", + "topology" ], "properties": { - "auditFilePath": { - "description": "All requests coming to the apiserver will be logged to this file.", + "name": { + "description": "name defines the arbitrary but unique name of a failure domain.", "type": "string", "default": "" }, - "enabled": { - "description": "If this flag is set, audit log will be printed in the logs. The logs contains, method, user and a requested URL.", - "type": "boolean", - "default": false - }, - "logFormat": { - "description": "Format of saved audits (legacy or json).", + "region": { + "description": "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.", "type": "string", "default": "" }, - "maximumFileRetentionDays": { - "description": "Maximum number of days to retain old log files based on the timestamp encoded in their filename.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "maximumFileSizeMegabytes": { - "description": "Maximum size in megabytes of the log file before it gets rotated. Defaults to 100MB.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "maximumRetainedFiles": { - "description": "Maximum number of old log files to retain.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "policyConfiguration": { - "description": "PolicyConfiguration is an embedded policy configuration object to be used as the audit policy configuration. If present, it will be used instead of the path to the policy file.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "policyFile": { - "description": "PolicyFile is a path to the file that defines the audit policy configuration.", + "server": { + "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", "type": "string", "default": "" }, - "webHookKubeConfig": { - "description": "Path to a .kubeconfig formatted file that defines the audit webhook configuration.", - "type": "string", - "default": "" + "topology": { + "description": "Topology describes a given failure domain using vSphere constructs", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformTopology" }, - "webHookMode": { - "description": "Strategy for sending audit events (block or batch).", + "zone": { + "description": "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AuditConfig", + "Kind": "VSpherePlatformFailureDomainSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.AugmentedActiveDirectoryConfig": { - "description": "AugmentedActiveDirectoryConfig holds the necessary configuration options to define how an LDAP group sync interacts with an LDAP server using the augmented Active Directory schema", + "io.openshift.config.v1.VSpherePlatformLoadBalancer": { + "description": "VSpherePlatformLoadBalancer defines the load balancer used by the cluster on VSphere platform.", "type": "object", - "required": [ - "usersQuery", - "userNameAttributes", - "groupMembershipAttributes", - "groupsQuery", - "groupUIDAttribute", - "groupNameAttributes" - ], "properties": { - "groupMembershipAttributes": { - "description": "GroupMembershipAttributes defines which attributes on an LDAP user entry will be interpreted as the groups it is a member of", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "groupNameAttributes": { - "description": "GroupNameAttributes defines which attributes on an LDAP group entry will be interpreted as its name to use for an OpenShift group", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "groupUIDAttribute": { - "description": "GroupUIDAttributes defines which attribute on an LDAP group entry will be interpreted as its unique identifier. (ldapGroupUID)", + "type": { + "description": "type defines the type of load balancer used by the cluster on VSphere platform which can be a user-managed or openshift-managed load balancer that is to be used for the OpenShift API and Ingress endpoints. When set to OpenShiftManagedDefault the static pods in charge of API and Ingress traffic load-balancing defined in the machine config operator will be deployed. When set to UserManaged these static pods will not be deployed and it is expected that the load balancer is configured out of band by the deployer. When omitted, this means no opinion and the platform is left to choose a reasonable default. The default value is OpenShiftManagedDefault.", "type": "string", - "default": "" - }, - "groupsQuery": { - "description": "AllGroupsQuery holds the template for an LDAP query that returns group entries.", + "default": "OpenShiftManagedDefault" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1", + "Kind": "VSpherePlatformLoadBalancer", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": {} + } + ] + }, + "io.openshift.config.v1.VSpherePlatformNodeNetworking": { + "description": "VSpherePlatformNodeNetworking holds the external and internal node networking spec.", + "type": "object", + "properties": { + "external": { + "description": "external represents the network configuration of the node that is externally routable.", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LDAPQuery" - }, - "userNameAttributes": { - "description": "UserNameAttributes defines which attributes on an LDAP user entry will be interpreted as its OpenShift user name.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworkingSpec" }, - "usersQuery": { - "description": "AllUsersQuery holds the template for an LDAP query that returns user entries.", + "internal": { + "description": "internal represents the network configuration of the node that is routable only within the cluster.", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LDAPQuery" + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworkingSpec" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "AugmentedActiveDirectoryConfig", + "Kind": "VSpherePlatformNodeNetworking", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.BasicAuthPasswordIdentityProvider": { - "description": "BasicAuthPasswordIdentityProvider provides identities for users authenticating using HTTP basic auth credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.VSpherePlatformNodeNetworkingSpec": { + "description": "VSpherePlatformNodeNetworkingSpec holds the network CIDR(s) and port group name for including and excluding IP ranges in the cloud provider. This would be used for example when multiple network adapters are attached to a guest to help determine which IP address the cloud config manager should use for the external and internal node networking.", "type": "object", - "required": [ - "url", - "ca", - "certFile", - "keyFile" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "ca": { - "description": "CA is the CA for verifying TLS connections", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" + "excludeNetworkSubnetCidr": { + "description": "excludeNetworkSubnetCidr IP addresses in subnet ranges will be excluded when selecting the IP address from the VirtualMachine's VM for use in the status.addresses fields.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "network": { + "description": "network VirtualMachine's VM Network names that will be used to when searching for status.addresses fields. Note that if internal.networkSubnetCIDR and external.networkSubnetCIDR are not set, then the vNIC associated to this network must only have a single IP address assigned to it. The available networks (port groups) can be listed using `govc ls 'network/*'`", "type": "string" }, - "url": { - "description": "URL is the remote URL to connect to", - "type": "string", - "default": "" + "networkSubnetCidr": { + "description": "networkSubnetCidr IP address on VirtualMachine's network interfaces included in the fields' CIDRs that will be used in respective status.addresses fields.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "BasicAuthPasswordIdentityProvider", + "Kind": "VSpherePlatformNodeNetworkingSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.BuildDefaultsConfig": { - "description": "BuildDefaultsConfig controls the default information for Builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.VSpherePlatformSpec": { + "description": "VSpherePlatformSpec holds the desired state of the vSphere infrastructure provider. In the future the cloud provider operator, storage operator and machine operator will use these fields for configuration.", "type": "object", "properties": { - "annotations": { - "description": "annotations are annotations that will be added to the build pod", - "type": "object", - "additionalProperties": { + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.apiServerInternalIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", + "type": "array", + "items": { "type": "string", "default": "" - } - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + }, + "x-kubernetes-list-type": "atomic" }, - "env": { - "description": "env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build", + "failureDomains": { + "description": "failureDomains contains the definition of region, zone and the vCenter topology. If this is omitted failure domains (regions and zones) will not be used.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar" - } - }, - "gitHTTPProxy": { - "description": "gitHTTPProxy is the location of the HTTPProxy for Git source", - "type": "string" - }, - "gitHTTPSProxy": { - "description": "gitHTTPSProxy is the location of the HTTPSProxy for Git source", - "type": "string" - }, - "gitNoProxy": { - "description": "gitNoProxy is the list of domains for which the proxy should not be used", - "type": "string" + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformFailureDomainSpec" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" }, - "imageLabels": { - "description": "imageLabels is a list of labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.", + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IP addresses, one from IPv4 family and one from IPv6. In single stack clusters a single IP address is expected. When omitted, values from the status.ingressIPs will be used. Once set, the list cannot be completely removed (but its second entry can).", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "nodeSelector": { - "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", - "type": "object", - "additionalProperties": { + "machineNetworks": { + "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes. Each network is provided in the CIDR format and should be IPv4 or IPv6, for example \"10.0.0.0/8\" or \"fd00::/8\".", + "type": "array", + "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, - "resources": { - "description": "resources defines resource requirements to execute the build.", + "nodeNetworking": { + "description": "nodeNetworking contains the definition of internal and external network constraints for assigning the node's networking. If this field is omitted, networking defaults to the legacy address selection behavior which is to only support a single address and return the first one found.", "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworking" }, - "sourceStrategyDefaults": { - "description": "sourceStrategyDefaults are default values that apply to builds using the source strategy.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.SourceStrategyDefaultsConfig" + "vcenters": { + "description": "vcenters holds the connection details for services to communicate with vCenter. Currently, only a single vCenter is supported, but in tech preview 3 vCenters are supported. Once the cluster has been installed, you are unable to change the current number of defined vCenters except in the case where the cluster has been upgraded from a version of OpenShift where the vsphere platform spec was not present. You may make modifications to the existing vCenters that are defined in the vcenters list in order to match with any added or modified failure domains.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformVCenterSpec" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "BuildDefaultsConfig", + "Kind": "VSpherePlatformSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.BuildOverridesConfig": { - "description": "BuildOverridesConfig controls override settings for builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1.VSpherePlatformStatus": { + "description": "VSpherePlatformStatus holds the current status of the vSphere infrastructure provider.", "type": "object", "required": [ - "forcePull" + "apiServerInternalIPs", + "ingressIPs" ], "properties": { - "annotations": { - "description": "annotations are annotations that will be added to the build pod", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "apiServerInternalIP": { + "description": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.\n\nDeprecated: Use APIServerInternalIPs instead.", "type": "string" }, - "forcePull": { - "description": "forcePull indicates whether the build strategy should always be set to ForcePull=true", - "type": "boolean", - "default": false - }, - "imageLabels": { - "description": "imageLabels is a list of labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.", + "apiServerInternalIPs": { + "description": "apiServerInternalIPs are the IP addresses to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. These are the IPs for a self-hosted load balancer in front of the API servers. In dual stack clusters this list contains two IPs otherwise only one.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "ingressIP": { + "description": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.\n\nDeprecated: Use IngressIPs instead.", "type": "string" }, - "nodeSelector": { - "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", - "type": "object", - "additionalProperties": { + "ingressIPs": { + "description": "ingressIPs are the external IPs which route to the default ingress controller. The IPs are suitable targets of a wildcard DNS record used to resolve default route host names. In dual stack clusters this list contains two IPs otherwise only one.", + "type": "array", + "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, - "tolerations": { - "description": "tolerations is a list of Tolerations that will override any existing tolerations set on a build pod.", + "loadBalancer": { + "description": "loadBalancer defines how the load balancer used by the cluster is configured.", + "default": { + "type": "OpenShiftManagedDefault" + }, + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformLoadBalancer" + }, + "machineNetworks": { + "description": "machineNetworks are IP networks used to connect all the OpenShift cluster nodes.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "nodeDNSIP": { + "description": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for vSphere deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.", + "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "BuildOverridesConfig", + "Kind": "VSpherePlatformStatus", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.CertInfo": { - "description": "CertInfo relates a certificate with a private key", + "io.openshift.config.v1.VSpherePlatformTopology": { + "description": "VSpherePlatformTopology holds the required and optional vCenter objects - datacenter, computeCluster, networks, datastore and resourcePool - to provision virtual machines.", "type": "object", "required": [ - "certFile", - "keyFile" + "datacenter", + "computeCluster", + "networks", + "datastore" ], "properties": { - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "computeCluster": { + "description": "computeCluster the absolute path of the vCenter cluster in which virtual machine will be located. The absolute path is of the form /\u003cdatacenter\u003e/host/\u003ccluster\u003e. The maximum length of the path is 2048 characters.", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "datacenter": { + "description": "datacenter is the name of vCenter datacenter in which virtual machines will be located. The maximum length of the datacenter name is 80 characters.", + "type": "string", + "default": "" + }, + "datastore": { + "description": "datastore is the absolute path of the datastore in which the virtual machine is located. The absolute path is of the form /\u003cdatacenter\u003e/datastore/\u003cdatastore\u003e The maximum length of the path is 2048 characters.", "type": "string", "default": "" + }, + "folder": { + "description": "folder is the absolute path of the folder where virtual machines are located. The absolute path is of the form /\u003cdatacenter\u003e/vm/\u003cfolder\u003e. The maximum length of the path is 2048 characters.", + "type": "string" + }, + "networks": { + "description": "networks is the list of port group network names within this failure domain. If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined. 10 is the maximum number of virtual network devices which may be attached to a VM as defined by: https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere\u0026release=vSphere%208.0\u0026categories=1-0 The available networks (port groups) can be listed using `govc ls 'network/*'` Networks should be in the form of an absolute path: /\u003cdatacenter\u003e/network/\u003cportgroup\u003e.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "resourcePool": { + "description": "resourcePool is the absolute path of the resource pool where virtual machines will be created. The absolute path is of the form /\u003cdatacenter\u003e/host/\u003ccluster\u003e/Resources/\u003cresourcepool\u003e. The maximum length of the path is 2048 characters.", + "type": "string" + }, + "template": { + "description": "template is the full inventory path of the virtual machine or template that will be cloned when creating new machines in this failure domain. The maximum length of the path is 2048 characters.\n\nWhen omitted, the template will be calculated by the control plane machineset operator based on the region and zone defined in VSpherePlatformFailureDomainSpec. For example, for zone=zonea, region=region1, and infrastructure name=test, the template path would be calculated as /\u003cdatacenter\u003e/vm/test-rhcos-region1-zonea.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "CertInfo", + "Kind": "VSpherePlatformTopology", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ClientConnectionOverrides": { - "description": "ClientConnectionOverrides are a set of overrides to the default client connection settings.", + "io.openshift.config.v1.VSpherePlatformVCenterSpec": { + "description": "VSpherePlatformVCenterSpec stores the vCenter connection fields. This is used by the vSphere CCM.", "type": "object", "required": [ - "acceptContentTypes", - "contentType", - "qps", - "burst" + "server", + "datacenters" ], "properties": { - "acceptContentTypes": { - "description": "AcceptContentTypes defines the Accept header sent by clients when connecting to a server, overriding the default value of 'application/json'. This field will control all connections to the server used by a particular client.", - "type": "string", - "default": "" + "datacenters": { + "description": "The vCenter Datacenters in which the RHCOS vm guests are located. This field will be used by the Cloud Controller Manager. Each datacenter listed here should be used within a topology.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" }, - "burst": { - "description": "Burst allows extra queries to accumulate when a client is exceeding its rate.", + "port": { + "description": "port is the TCP port that will be used to communicate to the vCenter endpoint. When omitted, this means the user has no opinion and it is up to the platform to choose a sensible default, which is subject to change over time.", "type": "integer", - "format": "int32", - "default": 0 + "format": "int32" }, - "contentType": { - "description": "ContentType is the content type used when sending data to the server from this client.", + "server": { + "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", "type": "string", "default": "" - }, - "qps": { - "description": "QPS controls the number of queries per second allowed for this connection.", - "type": "number", - "format": "float", - "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ClientConnectionOverrides", + "Kind": "VSpherePlatformVCenterSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ClusterNetworkEntry": { - "description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.", + "io.openshift.config.v1.WebhookTokenAuthenticator": { + "description": "webhookTokenAuthenticator holds the necessary configuration options for a remote token authenticator", "type": "object", "required": [ - "cidr", - "hostSubnetLength" + "kubeConfig" ], "properties": { - "cidr": { - "description": "CIDR defines the total range of a cluster networks address space.", - "type": "string", - "default": "" - }, - "hostSubnetLength": { - "description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pod.", - "type": "integer", - "format": "int64", - "default": 0 + "kubeConfig": { + "description": "kubeConfig references a secret that contains kube config file data which describes how to access the remote webhook service. The namespace for the referenced secret is openshift-config.\n\nFor further details, see:\n\nhttps://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication\n\nThe key \"kubeConfig\" is used to locate the data. If the secret or expected key is not found, the webhook is not honored. If the specified kube config data is not valid, the webhook is not honored.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "config.openshift.io", "Version": "v1", - "Kind": "ClusterNetworkEntry", + "Kind": "WebhookTokenAuthenticator", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ControllerConfig": { - "description": "ControllerConfig holds configuration values for controllers", + "io.openshift.config.v1alpha1.Backup": { + "description": "Backup provides configuration for performing backups of the openshift cluster.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "controllers", - "election", - "serviceServingCert" + "spec" ], "properties": { - "controllers": { - "description": "Controllers is a list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller \"+ named 'foo', '-foo' disables the controller named 'foo'. Defaults to \"*\".", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "election": { - "description": "Election defines the configuration for electing a controller instance to make changes to the cluster. If unspecified, the ControllerTTL value is checked to determine whether the legacy direct etcd election code will be used.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ControllerElectionConfig" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "serviceServingCert": { - "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.BackupSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ServiceServingCert" + "$ref": "#/definitions/io.openshift.config.v1alpha1.BackupStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "ControllerConfig", - "Scope": "Namespaced" + "Type": "object", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "Backup", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.ControllerElectionConfig": { - "description": "ControllerElectionConfig contains configuration values for deciding how a controller will be elected to act as leader.", + "io.openshift.config.v1alpha1.BackupList": { + "description": "BackupList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "lockName", - "lockNamespace", - "lockResource" + "metadata", + "items" ], "properties": { - "lockName": { - "description": "LockName is the resource name used to act as the lock for determining which controller instance should lead.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "lockNamespace": { - "description": "LockNamespace is the resource namespace used to act as the lock for determining which controller instance should lead. It defaults to \"kube-system\"", - "type": "string", - "default": "" + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.Backup" + } }, - "lockResource": { - "description": "LockResource is the group and resource name to use to coordinate for the controller lock. If unset, defaults to \"configmaps\".", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.GroupResource" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "ControllerElectionConfig", + "Type": "list", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "BackupList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.DNSConfig": { - "description": "DNSConfig holds the necessary configuration options for DNS", + "io.openshift.config.v1alpha1.BackupSpec": { "type": "object", "required": [ - "bindAddress", - "bindNetwork", - "allowRecursiveQueries" + "etcd" ], "properties": { - "allowRecursiveQueries": { - "description": "AllowRecursiveQueries allows the DNS server on the master to answer queries recursively. Note that open resolvers can be used for DNS amplification attacks and the master DNS should not be made accessible to public networks.", - "type": "boolean", - "default": false - }, - "bindAddress": { - "description": "BindAddress is the ip:port to serve DNS on", - "type": "string", - "default": "" - }, - "bindNetwork": { - "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", - "type": "string", - "default": "" + "etcd": { + "description": "etcd specifies the configuration for periodic backups of the etcd cluster", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.EtcdBackupSpec" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "DNSConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "BackupSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.DefaultAdmissionConfig": { - "description": "DefaultAdmissionConfig can be used to enable or disable various admission plugins. When this type is present as the `configuration` object under `pluginConfig` and *if* the admission plugin supports it, this will cause an \"off by default\" admission plugin to be enabled\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.BackupStatus": { + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "BackupStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1alpha1.ClusterImagePolicy": { + "description": "ClusterImagePolicy holds cluster-wide configuration for image signature verification\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "disable" + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "disable": { - "description": "Disable turns off an admission plugin that is enabled by default.", - "type": "boolean", - "default": false - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec contains the configuration for the cluster image policy.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.ClusterImagePolicySpec" + }, + "status": { + "description": "status contains the observed state of the resource.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.ClusterImagePolicyStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "DefaultAdmissionConfig", - "Scope": "Namespaced" + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ClusterImagePolicy", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.DenyAllPasswordIdentityProvider": { - "description": "DenyAllPasswordIdentityProvider provides no identities for users\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.ClusterImagePolicyList": { + "description": "ClusterImagePolicyList is a list of ClusterImagePolicy resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "metadata", + "items" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.ClusterImagePolicy" + } + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "DenyAllPasswordIdentityProvider", + "Type": "list", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ClusterImagePolicyList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.DockerConfig": { - "description": "DockerConfig holds Docker related configuration options.", + "io.openshift.config.v1alpha1.ClusterImagePolicySpec": { + "description": "CLusterImagePolicySpec is the specification of the ClusterImagePolicy custom resource.", "type": "object", "required": [ - "execHandlerName", - "dockerShimSocket", - "dockerShimRootDirectory" + "scopes", + "policy" ], "properties": { - "dockerShimRootDirectory": { - "description": "DockershimRootDirectory is the dockershim root directory.", - "type": "string", - "default": "" - }, - "dockerShimSocket": { - "description": "DockerShimSocket is the location of the dockershim socket the kubelet uses. Currently unix socket is supported on Linux, and tcp is supported on windows. Examples:'unix:///var/run/dockershim.sock', 'tcp://localhost:3735'", - "type": "string", - "default": "" + "policy": { + "description": "policy contains configuration to allow scopes to be verified, and defines how images not matching the verification policy will be treated.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.Policy" }, - "execHandlerName": { - "description": "ExecHandlerName is the name of the handler to use for executing commands in containers.", - "type": "string", - "default": "" + "scopes": { + "description": "scopes defines the list of image identities assigned to a policy. Each item refers to a scope in a registry implementing the \"Docker Registry HTTP API V2\". Scopes matching individual images are named Docker references in the fully expanded form, either using a tag or digest. For example, docker.io/library/busybox:latest (not busybox:latest). More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest), a repository namespace, or a registry host (by only specifying the host name and possibly a port number) or a wildcard expression starting with `*.`, for matching all subdomains (not including a port number). Wildcards are only supported for subdomain matching, and may not be used in the middle of the host, i.e. *.example.com is a valid case, but example*.*.com is not. If multiple scopes match a given image, only the policy requirements for the most specific scope apply. The policy requirements for more general scopes are ignored. In addition to setting a policy appropriate for your own deployed applications, make sure that a policy on the OpenShift image repositories quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev (or on a more general scope) allows deployment of the OpenShift images required for cluster operation. For additional details about the format, please refer to the document explaining the docker transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "DockerConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ClusterImagePolicySpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.EtcdConfig": { - "description": "EtcdConfig holds the necessary configuration options for connecting with an etcd database", + "io.openshift.config.v1alpha1.ClusterImagePolicyStatus": { "type": "object", - "required": [ - "servingInfo", - "address", - "peerServingInfo", - "peerAddress", - "storageDirectory" - ], "properties": { - "address": { - "description": "Address is the advertised host:port for client connections to etcd", - "type": "string", - "default": "" - }, - "peerAddress": { - "description": "PeerAddress is the advertised host:port for peer connections to etcd", - "type": "string", - "default": "" - }, - "peerServingInfo": { - "description": "PeerServingInfo describes how to start serving the etcd peer", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ServingInfo" - }, - "servingInfo": { - "description": "ServingInfo describes how to start serving the etcd master", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ServingInfo" - }, - "storageDirectory": { - "description": "StorageDir is the path to the etcd storage directory", - "type": "string", - "default": "" + "conditions": { + "description": "conditions provide details on the status of this API Resource.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "EtcdConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ClusterImagePolicyStatus", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.EtcdConnectionInfo": { - "description": "EtcdConnectionInfo holds information necessary for connecting to an etcd server", + "io.openshift.config.v1alpha1.EtcdBackupSpec": { + "description": "EtcdBackupSpec provides configuration for automated etcd backups to the cluster-etcd-operator", "type": "object", - "required": [ - "urls", - "ca", - "certFile", - "keyFile" - ], "properties": { - "ca": { - "description": "CA is a file containing trusted roots for the etcd server certificates", + "pvcName": { + "description": "PVCName specifies the name of the PersistentVolumeClaim (PVC) which binds a PersistentVolume where the etcd backup files would be saved The PVC itself must always be created in the \"openshift-etcd\" namespace If the PVC is left unspecified \"\" then the platform will choose a reasonable default location to save the backup. In the future this would be backups saved across the control-plane master nodes.", "type": "string", "default": "" }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "retentionPolicy": { + "description": "RetentionPolicy defines the retention policy for retaining and deleting existing backups.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.RetentionPolicy" + }, + "schedule": { + "description": "Schedule defines the recurring backup schedule in Cron format every 2 hours: 0 */2 * * * every day at 3am: 0 3 * * * Empty string means no opinion and the platform is left to choose a reasonable default which is subject to change without notice. The current default is \"no backups\", but will change in the future.", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "timeZone": { + "description": "The time zone name for the given schedule, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. If not specified, this will default to the time zone of the kube-controller-manager process. See https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#time-zones", "type": "string", "default": "" - }, - "urls": { - "description": "URLs are the URLs for etcd", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "EtcdConnectionInfo", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "EtcdBackupSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.EtcdStorageConfig": { - "description": "EtcdStorageConfig holds the necessary configuration options for the etcd storage underlying OpenShift and Kubernetes", + "io.openshift.config.v1alpha1.FulcioCAWithRekor": { + "description": "FulcioCAWithRekor defines the root of trust based on the Fulcio certificate and the Rekor public key.", "type": "object", "required": [ - "kubernetesStorageVersion", - "kubernetesStoragePrefix", - "openShiftStorageVersion", - "openShiftStoragePrefix" + "fulcioCAData", + "rekorKeyData" ], "properties": { - "kubernetesStoragePrefix": { - "description": "KubernetesStoragePrefix is the path within etcd that the Kubernetes resources will be rooted under. This value, if changed, will mean existing objects in etcd will no longer be located. The default value is 'kubernetes.io'.", - "type": "string", - "default": "" - }, - "kubernetesStorageVersion": { - "description": "KubernetesStorageVersion is the API version that Kube resources in etcd should be serialized to. This value should *not* be advanced until all clients in the cluster that read from etcd have code that allows them to read the new version.", + "fulcioCAData": { + "description": "fulcioCAData contains inline base64-encoded data for the PEM format fulcio CA. fulcioCAData must be at most 8192 characters.", "type": "string", - "default": "" + "format": "byte" }, - "openShiftStoragePrefix": { - "description": "OpenShiftStoragePrefix is the path within etcd that the OpenShift resources will be rooted under. This value, if changed, will mean existing objects in etcd will no longer be located. The default value is 'openshift.io'.", - "type": "string", - "default": "" + "fulcioSubject": { + "description": "fulcioSubject specifies OIDC issuer and the email of the Fulcio authentication configuration.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyFulcioSubject" }, - "openShiftStorageVersion": { - "description": "OpenShiftStorageVersion is the API version that OS resources in etcd should be serialized to. This value should *not* be advanced until all clients in the cluster that read from etcd have code that allows them to read the new version.", + "rekorKeyData": { + "description": "rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key. rekorKeyData must be at most 8192 characters.", "type": "string", - "default": "" + "format": "byte" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "EtcdStorageConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "FulcioCAWithRekor", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.GitHubIdentityProvider": { - "description": "GitHubIdentityProvider provides identities for users authenticating using GitHub credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.GatherConfig": { + "description": "gatherConfig provides data gathering configuration options.", "type": "object", - "required": [ - "clientID", - "clientSecret", - "organizations", - "teams", - "hostname", - "ca" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "ca": { - "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server. If empty, the default system roots are used. This can only be configured when hostname is set to a non-empty value.", - "type": "string", - "default": "" - }, - "clientID": { - "description": "ClientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "ClientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.StringSource" - }, - "hostname": { - "description": "Hostname is the optional domain (e.g. \"mycompany.com\") for use with a hosted instance of GitHub Enterprise. It must match the GitHub Enterprise settings value that is configured at /setup/settings#hostname.", - "type": "string", - "default": "" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "dataPolicy": { + "description": "dataPolicy allows user to enable additional global obfuscation of the IP addresses and base domain in the Insights archive data. Valid values are \"None\" and \"ObfuscateNetworking\". When set to None the data is not obfuscated. When set to ObfuscateNetworking the IP addresses and the cluster domain name are obfuscated. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is None.", "type": "string" }, - "organizations": { - "description": "Organizations optionally restricts which organizations are allowed to log in", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "teams": { - "description": "Teams optionally restricts which teams are allowed to log in. Format is \u003corg\u003e/\u003cteam\u003e.", + "disabledGatherers": { + "description": "disabledGatherers is a list of gatherers to be excluded from the gathering. All the gatherers can be disabled by providing \"all\" value. If all the gatherers are disabled, the Insights operator does not gather any data. The particular gatherers IDs can be found at https://github.com/openshift/insights-operator/blob/master/docs/gathered-data.md. Run the following command to get the names of last active gatherers: \"oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'\" An example of disabling gatherers looks like this: `disabledGatherers: [\"clusterconfig/machine_configs\", \"workloads/workload_info\"]`", "type": "array", "items": { "type": "string", @@ -31726,2895 +32229,2072 @@ } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "GitHubIdentityProvider", + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "GatherConfig", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.GitLabIdentityProvider": { - "description": "GitLabIdentityProvider provides identities for users authenticating using GitLab credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.ImagePolicy": { + "description": "ImagePolicy holds namespace-wide configuration for image signature verification\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "ca", - "url", - "clientID", - "clientSecret" + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ca": { - "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" - }, - "clientID": { - "description": "ClientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "ClientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.StringSource" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "legacy": { - "description": "Legacy determines if OAuth2 or OIDC should be used If true, OAuth2 is used If false, OIDC is used If nil and the URL's host is gitlab.com, OIDC is used Otherwise, OAuth2 is used In a future release, nil will default to using OIDC Eventually this flag will be removed and only OIDC will be used", - "type": "boolean" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "url": { - "description": "URL is the oauth server base URL", - "type": "string", - "default": "" + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.ImagePolicySpec" + }, + "status": { + "description": "status contains the observed state of the resource.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.ImagePolicyStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "GitLabIdentityProvider", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ImagePolicy", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.GoogleIdentityProvider": { - "description": "GoogleIdentityProvider provides identities for users authenticating using Google credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.ImagePolicyList": { + "description": "ImagePolicyList is a list of ImagePolicy resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "clientID", - "clientSecret", - "hostedDomain" + "metadata", + "items" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "clientID": { - "description": "ClientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "ClientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.StringSource" - }, - "hostedDomain": { - "description": "HostedDomain is the optional Google App domain (e.g. \"mycompany.com\") to restrict logins to", - "type": "string", - "default": "" + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.ImagePolicy" + } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "GoogleIdentityProvider", + "Type": "list", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ImagePolicyList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.GrantConfig": { - "description": "GrantConfig holds the necessary configuration options for grant handlers", + "io.openshift.config.v1alpha1.ImagePolicySpec": { + "description": "ImagePolicySpec is the specification of the ImagePolicy CRD.", "type": "object", "required": [ - "method", - "serviceAccountMethod" + "scopes", + "policy" ], "properties": { - "method": { - "description": "Method determines the default strategy to use when an OAuth client requests a grant. This method will be used only if the specific OAuth client doesn't provide a strategy of their own. Valid grant handling methods are:\n - auto: always approves grant requests, useful for trusted clients\n - prompt: prompts the end user for approval of grant requests, useful for third-party clients\n - deny: always denies grant requests, useful for black-listed clients", - "type": "string", - "default": "" + "policy": { + "description": "policy contains configuration to allow scopes to be verified, and defines how images not matching the verification policy will be treated.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.Policy" }, - "serviceAccountMethod": { - "description": "ServiceAccountMethod is used for determining client authorization for service account oauth client. It must be either: deny, prompt", - "type": "string", - "default": "" + "scopes": { + "description": "scopes defines the list of image identities assigned to a policy. Each item refers to a scope in a registry implementing the \"Docker Registry HTTP API V2\". Scopes matching individual images are named Docker references in the fully expanded form, either using a tag or digest. For example, docker.io/library/busybox:latest (not busybox:latest). More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest), a repository namespace, or a registry host (by only specifying the host name and possibly a port number) or a wildcard expression starting with `*.`, for matching all subdomains (not including a port number). Wildcards are only supported for subdomain matching, and may not be used in the middle of the host, i.e. *.example.com is a valid case, but example*.*.com is not. If multiple scopes match a given image, only the policy requirements for the most specific scope apply. The policy requirements for more general scopes are ignored. In addition to setting a policy appropriate for your own deployed applications, make sure that a policy on the OpenShift image repositories quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev (or on a more general scope) allows deployment of the OpenShift images required for cluster operation. For additional details about the format, please refer to the document explaining the docker transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "GrantConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ImagePolicySpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.GroupResource": { - "description": "GroupResource points to a resource by its name and API group.", + "io.openshift.config.v1alpha1.ImagePolicyStatus": { "type": "object", - "required": [ - "group", - "resource" - ], "properties": { - "group": { - "description": "Group is the name of an API group", - "type": "string", - "default": "" - }, - "resource": { - "description": "Resource is the name of a resource.", - "type": "string", - "default": "" + "conditions": { + "description": "conditions provide details on the status of this API Resource.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "GroupResource", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "ImagePolicyStatus", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.HTPasswdPasswordIdentityProvider": { - "description": "HTPasswdPasswordIdentityProvider provides identities for users authenticating using htpasswd credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.InsightsDataGather": { + "description": "InsightsDataGather provides data gather configuration options for the the Insights Operator.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "file" + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "file": { - "description": "File is a reference to your htpasswd file", - "type": "string", - "default": "" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.InsightsDataGatherSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.InsightsDataGatherStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "HTPasswdPasswordIdentityProvider", - "Scope": "Namespaced" + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "InsightsDataGather", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.HTTPServingInfo": { - "description": "HTTPServingInfo holds configuration for serving HTTP", + "io.openshift.config.v1alpha1.InsightsDataGatherList": { + "description": "InsightsDataGatherList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "bindAddress", - "bindNetwork", - "certFile", - "keyFile", - "clientCA", - "namedCertificates", - "maxRequestsInFlight", - "requestTimeoutSeconds" + "metadata", + "items" ], "properties": { - "bindAddress": { - "description": "BindAddress is the ip:port to serve on", - "type": "string", - "default": "" - }, - "bindNetwork": { - "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "cipherSuites": { - "description": "CipherSuites contains an overridden list of ciphers for the server to support. Values must match cipher suite IDs from https://golang.org/pkg/crypto/tls/#pkg-constants", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "clientCA": { - "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", - "type": "string", - "default": "" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" - }, - "maxRequestsInFlight": { - "description": "MaxRequestsInFlight is the number of concurrent requests allowed to the server. If zero, no limit.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "minTLSVersion": { - "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "namedCertificates": { - "description": "NamedCertificates is a list of certificates to use to secure requests to specific hostnames", + "items": { "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.NamedCertificate" + "$ref": "#/definitions/io.openshift.config.v1alpha1.InsightsDataGather" } }, - "requestTimeoutSeconds": { - "description": "RequestTimeoutSeconds is the number of seconds before requests are timed out. The default is 60 minutes, if -1 there is no limit on requests.", - "type": "integer", - "format": "int32", - "default": 0 + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "HTTPServingInfo", + "Type": "list", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "InsightsDataGatherList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.IdentityProvider": { - "description": "IdentityProvider provides identities for users authenticating using credentials", + "io.openshift.config.v1alpha1.InsightsDataGatherSpec": { "type": "object", - "required": [ - "name", - "challenge", - "login", - "mappingMethod", - "provider" - ], "properties": { - "challenge": { - "description": "UseAsChallenger indicates whether to issue WWW-Authenticate challenges for this provider", - "type": "boolean", - "default": false - }, - "login": { - "description": "UseAsLogin indicates whether to use this identity provider for unauthenticated browsers to login against", - "type": "boolean", - "default": false - }, - "mappingMethod": { - "description": "MappingMethod determines how identities from this provider are mapped to users", - "type": "string", - "default": "" - }, - "name": { - "description": "Name is used to qualify the identities returned by this provider", - "type": "string", - "default": "" - }, - "provider": { - "description": "Provider contains the information about how to set up a specific identity provider", + "gatherConfig": { + "description": "gatherConfig spec attribute includes all the configuration options related to gathering of the Insights data and its uploading to the ingress.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "$ref": "#/definitions/io.openshift.config.v1alpha1.GatherConfig" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "IdentityProvider", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "InsightsDataGatherSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ImageConfig": { - "description": "ImageConfig holds the necessary configuration options for building image names for system components", + "io.openshift.config.v1alpha1.InsightsDataGatherStatus": { "type": "object", - "required": [ - "format", - "latest" - ], - "properties": { - "format": { - "description": "Format is the format of the name to be built for the system component", - "type": "string", - "default": "" - }, - "latest": { - "description": "Latest determines if the latest tag will be pulled from the registry", - "type": "boolean", - "default": false - } - }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "ImageConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "InsightsDataGatherStatus", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ImagePolicyConfig": { - "description": "ImagePolicyConfig holds the necessary configuration options for limits and behavior for importing images", + "io.openshift.config.v1alpha1.Policy": { + "description": "Policy defines the verification policy for the items in the scopes list.", "type": "object", "required": [ - "maxImagesBulkImportedPerRepository", - "disableScheduledImport", - "scheduledImageImportMinimumIntervalSeconds", - "maxScheduledImageImportsPerMinute" + "rootOfTrust" ], "properties": { - "additionalTrustedCA": { - "description": "AdditionalTrustedCA is a path to a pem bundle file containing additional CAs that should be trusted during imagestream import.", - "type": "string" - }, - "allowedRegistriesForImport": { - "description": "AllowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.RegistryLocation" - } - }, - "disableScheduledImport": { - "description": "DisableScheduledImport allows scheduled background import of images to be disabled.", - "type": "boolean", - "default": false - }, - "externalRegistryHostname": { - "description": "ExternalRegistryHostname sets the hostname for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", - "type": "string" - }, - "internalRegistryHostname": { - "description": "InternalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.", - "type": "string" - }, - "maxImagesBulkImportedPerRepository": { - "description": "MaxImagesBulkImportedPerRepository controls the number of images that are imported when a user does a bulk import of a container repository. This number defaults to 50 to prevent users from importing large numbers of images accidentally. Set -1 for no limit.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "maxScheduledImageImportsPerMinute": { - "description": "MaxScheduledImageImportsPerMinute is the maximum number of scheduled image streams that will be imported in the background per minute. The default value is 60. Set to -1 for unlimited.", - "type": "integer", - "format": "int32", - "default": 0 + "rootOfTrust": { + "description": "rootOfTrust specifies the root of trust for the policy.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyRootOfTrust" }, - "scheduledImageImportMinimumIntervalSeconds": { - "description": "ScheduledImageImportMinimumIntervalSeconds is the minimum number of seconds that can elapse between when image streams scheduled for background import are checked against the upstream repository. The default value is 15 minutes.", - "type": "integer", - "format": "int32", - "default": 0 + "signedIdentity": { + "description": "signedIdentity specifies what image identity the signature claims about the image. The required matchPolicy field specifies the approach used in the verification process to verify the identity in the signature and the actual image identity, the default matchPolicy is \"MatchRepoDigestOrExact\".", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyIdentity" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "ImagePolicyConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "Policy", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.JenkinsPipelineConfig": { - "description": "JenkinsPipelineConfig holds configuration for the Jenkins pipeline strategy", + "io.openshift.config.v1alpha1.PolicyFulcioSubject": { + "description": "PolicyFulcioSubject defines the OIDC issuer and the email of the Fulcio authentication configuration.", "type": "object", "required": [ - "autoProvisionEnabled", - "templateNamespace", - "templateName", - "serviceName", - "parameters" + "oidcIssuer", + "signedEmail" ], "properties": { - "autoProvisionEnabled": { - "description": "AutoProvisionEnabled determines whether a Jenkins server will be spawned from the provided template when the first build config in the project with type JenkinsPipeline is created. When not specified this option defaults to true.", - "type": "boolean" - }, - "parameters": { - "description": "Parameters specifies a set of optional parameters to the Jenkins template.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "serviceName": { - "description": "ServiceName is the name of the Jenkins service OpenShift uses to detect whether a Jenkins pipeline handler has already been installed in a project. This value *must* match a service name in the provided template.", - "type": "string", - "default": "" - }, - "templateName": { - "description": "TemplateName is the name of the default Jenkins template", + "oidcIssuer": { + "description": "oidcIssuer contains the expected OIDC issuer. It will be verified that the Fulcio-issued certificate contains a (Fulcio-defined) certificate extension pointing at this OIDC issuer URL. When Fulcio issues certificates, it includes a value based on an URL inside the client-provided ID token. Example: \"https://expected.OIDC.issuer/\"", "type": "string", "default": "" }, - "templateNamespace": { - "description": "TemplateNamespace contains the namespace name where the Jenkins template is stored", + "signedEmail": { + "description": "signedEmail holds the email address the the Fulcio certificate is issued for. Example: \"expected-signing-user@example.com\"", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "JenkinsPipelineConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "PolicyFulcioSubject", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.KeystonePasswordIdentityProvider": { - "description": "KeystonePasswordIdentityProvider provides identities for users authenticating using keystone password credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.config.v1alpha1.PolicyIdentity": { + "description": "PolicyIdentity defines image identity the signature claims about the image. When omitted, the default matchPolicy is \"MatchRepoDigestOrExact\".", "type": "object", "required": [ - "url", - "ca", - "certFile", - "keyFile", - "domainName", - "useKeystoneIdentity" + "matchPolicy" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "ca": { - "description": "CA is the CA for verifying TLS connections", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "domainName": { - "description": "Domain Name is required for keystone v3", - "type": "string", - "default": "" + "exactRepository": { + "description": "exactRepository is required if matchPolicy is set to \"ExactRepository\".", + "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyMatchExactRepository" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "matchPolicy": { + "description": "matchPolicy sets the type of matching to be used. Valid values are \"MatchRepoDigestOrExact\", \"MatchRepository\", \"ExactRepository\", \"RemapIdentity\". When omitted, the default value is \"MatchRepoDigestOrExact\". If set matchPolicy to ExactRepository, then the exactRepository must be specified. If set matchPolicy to RemapIdentity, then the remapIdentity must be specified. \"MatchRepoDigestOrExact\" means that the identity in the signature must be in the same repository as the image identity if the image identity is referenced by a digest. Otherwise, the identity in the signature must be the same as the image identity. \"MatchRepository\" means that the identity in the signature must be in the same repository as the image identity. \"ExactRepository\" means that the identity in the signature must be in the same repository as a specific identity specified by \"repository\". \"RemapIdentity\" means that the signature must be in the same as the remapped image identity. Remapped image identity is obtained by replacing the \"prefix\" with the specified “signedPrefix” if the the image identity matches the specified remapPrefix.", "type": "string", "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "url": { - "description": "URL is the remote URL to connect to", + "remapIdentity": { + "description": "remapIdentity is required if matchPolicy is set to \"RemapIdentity\".", + "$ref": "#/definitions/io.openshift.config.v1alpha1.PolicyMatchRemapIdentity" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "PolicyIdentity", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "matchPolicy", + "fields-to-discriminateBy": { + "exactRepository": "PolicyMatchExactRepository", + "remapIdentity": "PolicyMatchRemapIdentity" + } + } + ] + }, + "io.openshift.config.v1alpha1.PolicyMatchExactRepository": { + "type": "object", + "required": [ + "repository" + ], + "properties": { + "repository": { + "description": "repository is the reference of the image identity to be matched. The value should be a repository name (by omitting the tag or digest) in a registry implementing the \"Docker Registry HTTP API V2\". For example, docker.io/library/busybox", "type": "string", "default": "" - }, - "useKeystoneIdentity": { - "description": "UseKeystoneIdentity flag indicates that user should be authenticated by keystone ID, not by username", - "type": "boolean", - "default": false } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "KeystonePasswordIdentityProvider", + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "PolicyMatchExactRepository", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.KubeletConnectionInfo": { - "description": "KubeletConnectionInfo holds information necessary for connecting to a kubelet", + "io.openshift.config.v1alpha1.PolicyMatchRemapIdentity": { "type": "object", "required": [ - "port", - "ca", - "certFile", - "keyFile" + "prefix", + "signedPrefix" ], "properties": { - "ca": { - "description": "CA is the CA for verifying TLS connections to kubelets", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", + "prefix": { + "description": "prefix is the prefix of the image identity to be matched. If the image identity matches the specified prefix, that prefix is replaced by the specified “signedPrefix” (otherwise it is used as unchanged and no remapping takes place). This useful when verifying signatures for a mirror of some other repository namespace that preserves the vendor’s repository structure. The prefix and signedPrefix values can be either host[:port] values (matching exactly the same host[:port], string), repository namespaces, or repositories (i.e. they must not contain tags/digests), and match as prefixes of the fully expanded form. For example, docker.io/library/busybox (not busybox) to specify that single repository, or docker.io/library (not an empty string) to specify the parent namespace of docker.io/library/busybox.", "type": "string", "default": "" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "signedPrefix": { + "description": "signedPrefix is the prefix of the image identity to be matched in the signature. The format is the same as \"prefix\". The values can be either host[:port] values (matching exactly the same host[:port], string), repository namespaces, or repositories (i.e. they must not contain tags/digests), and match as prefixes of the fully expanded form. For example, docker.io/library/busybox (not busybox) to specify that single repository, or docker.io/library (not an empty string) to specify the parent namespace of docker.io/library/busybox.", "type": "string", "default": "" - }, - "port": { - "description": "Port is the port to connect to kubelets on", - "type": "integer", - "format": "int32", - "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "KubeletConnectionInfo", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "PolicyMatchRemapIdentity", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.KubernetesMasterConfig": { - "description": "KubernetesMasterConfig holds the necessary configuration options for the Kubernetes master", + "io.openshift.config.v1alpha1.PolicyRootOfTrust": { + "description": "PolicyRootOfTrust defines the root of trust based on the selected policyType.", "type": "object", "required": [ - "apiLevels", - "disabledAPIGroupVersions", - "masterIP", - "masterEndpointReconcileTTL", - "servicesSubnet", - "servicesNodePortRange", - "schedulerConfigFile", - "podEvictionTimeout", - "proxyClientInfo", - "apiServerArguments", - "controllerArguments", - "schedulerArguments" + "policyType" ], "properties": { - "apiLevels": { - "description": "APILevels is a list of API levels that should be enabled on startup: v1 as examples", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "apiServerArguments": { - "description": "APIServerArguments are key value pairs that will be passed directly to the Kube apiserver that match the apiservers's command line arguments. These are not migrated, but if you reference a value that does not exist the server will not start. These values may override other settings in KubernetesMasterConfig which may cause invalid configurations.", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "controllerArguments": { - "description": "ControllerArguments are key value pairs that will be passed directly to the Kube controller manager that match the controller manager's command line arguments. These are not migrated, but if you reference a value that does not exist the server will not start. These values may override other settings in KubernetesMasterConfig which may cause invalid configurations.", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "disabledAPIGroupVersions": { - "description": "DisabledAPIGroupVersions is a map of groups to the versions (or *) that should be disabled.", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "masterEndpointReconcileTTL": { - "description": "MasterEndpointReconcileTTL sets the time to live in seconds of an endpoint record recorded by each master. The endpoints are checked at an interval that is 2/3 of this value and this value defaults to 15s if unset. In very large clusters, this value may be increased to reduce the possibility that the master endpoint record expires (due to other load on the etcd server) and causes masters to drop in and out of the kubernetes service record. It is not recommended to set this value below 15s.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "masterIP": { - "description": "MasterIP is the public IP address of kubernetes stuff. If empty, the first result from net.InterfaceAddrs will be used.", - "type": "string", - "default": "" + "fulcioCAWithRekor": { + "description": "fulcioCAWithRekor defines the root of trust based on the Fulcio certificate and the Rekor public key. For more information about Fulcio and Rekor, please refer to the document at: https://github.com/sigstore/fulcio and https://github.com/sigstore/rekor", + "$ref": "#/definitions/io.openshift.config.v1alpha1.FulcioCAWithRekor" }, - "podEvictionTimeout": { - "description": "PodEvictionTimeout controls grace period for deleting pods on failed nodes. It takes valid time duration string. If empty, you get the default pod eviction timeout.", + "policyType": { + "description": "policyType serves as the union's discriminator. Users are required to assign a value to this field, choosing one of the policy types that define the root of trust. \"PublicKey\" indicates that the policy relies on a sigstore publicKey and may optionally use a Rekor verification. \"FulcioCAWithRekor\" indicates that the policy is based on the Fulcio certification and incorporates a Rekor verification.", "type": "string", "default": "" }, - "proxyClientInfo": { - "description": "ProxyClientInfo specifies the client cert/key to use when proxying to pods", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.CertInfo" - }, - "schedulerArguments": { - "description": "SchedulerArguments are key value pairs that will be passed directly to the Kube scheduler that match the scheduler's command line arguments. These are not migrated, but if you reference a value that does not exist the server will not start. These values may override other settings in KubernetesMasterConfig which may cause invalid configurations.", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } + "publicKey": { + "description": "publicKey defines the root of trust based on a sigstore public key.", + "$ref": "#/definitions/io.openshift.config.v1alpha1.PublicKey" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "PolicyRootOfTrust", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "policyType", + "fields-to-discriminateBy": { + "fulcioCAWithRekor": "FulcioCAWithRekor", + "publicKey": "PublicKey" } - }, - "schedulerConfigFile": { - "description": "SchedulerConfigFile points to a file that describes how to set up the scheduler. If empty, you get the default scheduling rules.", - "type": "string", - "default": "" - }, - "servicesNodePortRange": { - "description": "ServicesNodePortRange is the range to use for assigning service public ports on a host.", + } + ] + }, + "io.openshift.config.v1alpha1.PublicKey": { + "description": "PublicKey defines the root of trust based on a sigstore public key.", + "type": "object", + "required": [ + "keyData" + ], + "properties": { + "keyData": { + "description": "keyData contains inline base64-encoded data for the PEM format public key. KeyData must be at most 8192 characters.", "type": "string", - "default": "" + "format": "byte" }, - "servicesSubnet": { - "description": "ServicesSubnet is the subnet to use for assigning service IPs", + "rekorKeyData": { + "description": "rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key. rekorKeyData must be at most 8192 characters.", "type": "string", - "default": "" + "format": "byte" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "KubernetesMasterConfig", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "PublicKey", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.LDAPAttributeMapping": { - "description": "LDAPAttributeMapping maps LDAP attributes to OpenShift identity fields", + "io.openshift.config.v1alpha1.RetentionNumberConfig": { + "description": "RetentionNumberConfig specifies the configuration of the retention policy on the number of backups", + "type": "object", + "properties": { + "maxNumberOfBackups": { + "description": "MaxNumberOfBackups defines the maximum number of backups to retain. If the existing number of backups saved is equal to MaxNumberOfBackups then the oldest backup will be removed before a new backup is initiated.", + "type": "integer", + "format": "int32" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "RetentionNumberConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.config.v1alpha1.RetentionPolicy": { + "description": "RetentionPolicy defines the retention policy for retaining and deleting existing backups. This struct is a discriminated union that allows users to select the type of retention policy from the supported types.", "type": "object", "required": [ - "id", - "preferredUsername", - "name", - "email" + "retentionType" ], "properties": { - "email": { - "description": "Email is the list of attributes whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "id": { - "description": "ID is the list of attributes whose values should be used as the user ID. Required. LDAP standard identity attribute is \"dn\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "retentionNumber": { + "description": "RetentionNumber configures the retention policy based on the number of backups", + "$ref": "#/definitions/io.openshift.config.v1alpha1.RetentionNumberConfig" }, - "name": { - "description": "Name is the list of attributes whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity LDAP standard display name attribute is \"cn\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "retentionSize": { + "description": "RetentionSize configures the retention policy based on the size of backups", + "$ref": "#/definitions/io.openshift.config.v1alpha1.RetentionSizeConfig" }, - "preferredUsername": { - "description": "PreferredUsername is the list of attributes whose values should be used as the preferred username. LDAP standard login attribute is \"uid\"", - "type": "array", - "items": { - "type": "string", - "default": "" + "retentionType": { + "description": "RetentionType sets the type of retention policy. Currently, the only valid policies are retention by number of backups (RetentionNumber), by the size of backups (RetentionSize). More policies or types may be added in the future. Empty string means no opinion and the platform is left to choose a reasonable default which is subject to change without notice. The current default is RetentionNumber with 15 backups kept.\n\nPossible enum values:\n - `\"RetentionNumber\"` sets the retention policy based on the number of backup files saved\n - `\"RetentionSize\"` sets the retention policy based on the total size of the backup files saved", + "type": "string", + "default": "", + "enum": [ + "RetentionNumber", + "RetentionSize" + ] + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "RetentionPolicy", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "retentionType", + "fields-to-discriminateBy": { + "retentionNumber": "RetentionNumber", + "retentionSize": "RetentionSize" } } + ] + }, + "io.openshift.config.v1alpha1.RetentionSizeConfig": { + "description": "RetentionSizeConfig specifies the configuration of the retention policy on the total size of backups", + "type": "object", + "properties": { + "maxSizeOfBackupsGb": { + "description": "MaxSizeOfBackupsGb defines the total size in GB of backups to retain. If the current total size backups exceeds MaxSizeOfBackupsGb then the oldest backup will be removed before a new backup is initiated.", + "type": "integer", + "format": "int32" + } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "LDAPAttributeMapping", + "Group": "config.openshift.io", + "Version": "v1alpha1", + "Kind": "RetentionSizeConfig", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.LDAPPasswordIdentityProvider": { - "description": "LDAPPasswordIdentityProvider provides identities for users authenticating using LDAP credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ApplicationMenuSpec": { + "description": "ApplicationMenuSpec is the specification of the desired section and icon used for the link in the application menu.", "type": "object", "required": [ - "url", - "bindDN", - "bindPassword", - "insecure", - "ca", - "attributes" + "section" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "attributes": { - "description": "Attributes maps LDAP attributes to identities", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LDAPAttributeMapping" - }, - "bindDN": { - "description": "BindDN is an optional DN to bind with during the search phase.", - "type": "string", - "default": "" - }, - "bindPassword": { - "description": "BindPassword is an optional password to bind with during the search phase.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.StringSource" - }, - "ca": { - "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" - }, - "insecure": { - "description": "Insecure, if true, indicates the connection should not use TLS. Cannot be set to true with a URL scheme of \"ldaps://\" If false, \"ldaps://\" URLs connect using TLS, and \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830", - "type": "boolean", - "default": false - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "imageURL": { + "description": "imageUrl is the URL for the icon used in front of the link in the application menu. The URL must be an HTTPS URL or a Data URI. The image should be square and will be shown at 24x24 pixels.", "type": "string" }, - "url": { - "description": "URL is an RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is\n ldap://host:port/basedn?attribute?scope?filter", + "section": { + "description": "section is the section of the application menu in which the link should appear. This can be any text that will appear as a subheading in the application menu dropdown. A new section will be created if the text does not match text of an existing section.", "type": "string", "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "LDAPPasswordIdentityProvider", + "Kind": "ApplicationMenuSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.LDAPQuery": { - "description": "LDAPQuery holds the options necessary to build an LDAP query", + "io.openshift.console.v1.CLIDownloadLink": { "type": "object", "required": [ - "baseDN", - "scope", - "derefAliases", - "timeout", - "filter", - "pageSize" + "href" ], "properties": { - "baseDN": { - "description": "The DN of the branch of the directory where all searches should start from", + "href": { + "description": "href is the absolute secure URL for the link (must use https)", "type": "string", "default": "" }, - "derefAliases": { - "description": "The (optional) behavior of the search with regards to alisases. Can be: never: never dereference aliases, search: only dereference in searching, base: only dereference in finding the base object, always: always dereference Defaults to always dereferencing if not set", - "type": "string", - "default": "" - }, - "filter": { - "description": "Filter is a valid LDAP search filter that retrieves all relevant entries from the LDAP server with the base DN", - "type": "string", - "default": "" - }, - "pageSize": { - "description": "PageSize is the maximum preferred page size, measured in LDAP entries. A page size of 0 means no paging will be done.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "scope": { - "description": "The (optional) scope of the search. Can be: base: only the base object, one: all object on the base level, sub: the entire subtree Defaults to the entire subtree if not set", + "text": { + "description": "text is the display text for the link", "type": "string", "default": "" - }, - "timeout": { - "description": "TimeLimit holds the limit of time in seconds that any request to the server can remain outstanding before the wait for a response is given up. If this is 0, no client-side limit is imposed", - "type": "integer", - "format": "int32", - "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "LDAPQuery", + "Kind": "CLIDownloadLink", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.LDAPSyncConfig": { - "description": "LDAPSyncConfig holds the necessary configuration options to define an LDAP group sync\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ConsoleCLIDownload": { + "description": "ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "url", - "bindDN", - "bindPassword", - "insecure", - "ca", - "groupUIDNameMapping" + "spec" ], "properties": { - "activeDirectory": { - "description": "ActiveDirectoryConfig holds the configuration for extracting data from an LDAP server set up in a fashion similar to that used in Active Directory: first-class user entries, with group membership determined by a multi-valued attribute on members listing groups they are a member of", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ActiveDirectoryConfig" - }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "augmentedActiveDirectory": { - "description": "AugmentedActiveDirectoryConfig holds the configuration for extracting data from an LDAP server set up in a fashion similar to that used in Active Directory as described above, with one addition: first-class group entries exist and are used to hold metadata but not group membership", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.AugmentedActiveDirectoryConfig" - }, - "bindDN": { - "description": "BindDN is an optional DN to bind to the LDAP server with", - "type": "string", - "default": "" - }, - "bindPassword": { - "description": "BindPassword is an optional password to bind with during the search phase.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.StringSource" - }, - "ca": { - "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" - }, - "groupUIDNameMapping": { - "description": "LDAPGroupUIDToOpenShiftGroupNameMapping is an optional direct mapping of LDAP group UIDs to OpenShift Group names", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "insecure": { - "description": "Insecure, if true, indicates the connection should not use TLS. Cannot be set to true with a URL scheme of \"ldaps://\" If false, \"ldaps://\" URLs connect using TLS, and \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830", - "type": "boolean", - "default": false - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "rfc2307": { - "description": "RFC2307Config holds the configuration for extracting data from an LDAP server set up in a fashion similar to RFC2307: first-class group and user entries, with group membership determined by a multi-valued attribute on the group entry listing its members", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.RFC2307Config" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "url": { - "description": "Host is the scheme, host and port of the LDAP server to connect to: scheme://host:port", - "type": "string", - "default": "" + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleCLIDownloadSpec" } }, "x-fabric8-info": { "Type": "object", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "LDAPSyncConfig", - "Scope": "Namespaced" + "Kind": "ConsoleCLIDownload", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.LocalQuota": { - "description": "LocalQuota contains options for controlling local volume quota on the node.", + "io.openshift.console.v1.ConsoleCLIDownloadList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "perFSGroup" + "metadata", + "items" ], "properties": { - "perFSGroup": { - "description": "FSGroup can be specified to enable a quota on local storage use per unique FSGroup ID. At present this is only implemented for emptyDir volumes, and if the underlying volumeDirectory is on an XFS filesystem.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleCLIDownload" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "LocalQuota", + "Kind": "ConsoleCLIDownloadList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.MasterAuthConfig": { - "description": "MasterAuthConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", + "io.openshift.console.v1.ConsoleCLIDownloadSpec": { + "description": "ConsoleCLIDownloadSpec is the desired cli download configuration.", "type": "object", "required": [ - "requestHeader", - "webhookTokenAuthenticators", - "oauthMetadataFile" + "displayName", + "description", + "links" ], "properties": { - "oauthMetadataFile": { - "description": "OAuthMetadataFile is a path to a file containing the discovery endpoint for OAuth 2.0 Authorization Server Metadata for an external OAuth server. See IETF Draft: // https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 This option is mutually exclusive with OAuthConfig", + "description": { + "description": "description is the description of the CLI download (can include markdown).", "type": "string", "default": "" }, - "requestHeader": { - "description": "RequestHeader holds options for setting up a front proxy against the API. It is optional.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.RequestHeaderAuthenticationOptions" + "displayName": { + "description": "displayName is the display name of the CLI download.", + "type": "string", + "default": "" }, - "webhookTokenAuthenticators": { - "description": "WebhookTokenAuthnConfig, if present configures remote token reviewers", + "links": { + "description": "links is a list of objects that provide CLI download link details.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.WebhookTokenAuthenticator" + "$ref": "#/definitions/io.openshift.console.v1.CLIDownloadLink" } } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "MasterAuthConfig", + "Kind": "ConsoleCLIDownloadSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.MasterClients": { - "description": "MasterClients holds references to `.kubeconfig` files that qualify master clients for OpenShift and Kubernetes", + "io.openshift.console.v1.ConsoleExternalLogLink": { + "description": "ConsoleExternalLogLink is an extension for customizing OpenShift web console log links.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "openshiftLoopbackKubeConfig", - "openshiftLoopbackClientConnectionOverrides" + "spec" ], "properties": { - "openshiftLoopbackClientConnectionOverrides": { - "description": "OpenShiftLoopbackClientConnectionOverrides specifies client overrides for system components to loop back to this master.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ClientConnectionOverrides" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "openshiftLoopbackKubeConfig": { - "description": "OpenShiftLoopbackKubeConfig is a .kubeconfig filename for system components to loopback to this master", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleExternalLogLinkSpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "MasterClients", - "Scope": "Namespaced" + "Kind": "ConsoleExternalLogLink", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.MasterConfig": { - "description": "MasterConfig holds the necessary configuration options for the OpenShift master\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ConsoleExternalLogLinkList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "servingInfo", - "authConfig", - "aggregatorConfig", - "corsAllowedOrigins", - "apiLevels", - "masterPublicURL", - "controllers", - "admissionConfig", - "controllerConfig", - "etcdStorageConfig", - "etcdClientInfo", - "kubeletClientInfo", - "kubernetesMasterConfig", - "etcdConfig", - "oauthConfig", - "dnsConfig", - "serviceAccountConfig", - "masterClients", - "imageConfig", - "imagePolicyConfig", - "policyConfig", - "projectConfig", - "routingConfig", - "networkConfig", - "volumeConfig", - "jenkinsPipelineConfig", - "auditConfig" + "metadata", + "items" ], "properties": { - "admissionConfig": { - "description": "AdmissionConfig contains admission control plugin configuration.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.AdmissionConfig" - }, - "aggregatorConfig": { - "description": "AggregatorConfig has options for configuring the aggregator component of the API server.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.AggregatorConfig" - }, - "apiLevels": { - "description": "APILevels is a list of API levels that should be enabled on startup: v1 as examples", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "auditConfig": { - "description": "AuditConfig holds information related to auditing capabilities.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.AuditConfig" - }, - "authConfig": { - "description": "AuthConfig configures authentication options in addition to the standard oauth token and client certificate authenticators", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.MasterAuthConfig" - }, - "controllerConfig": { - "description": "ControllerConfig holds configuration values for controllers", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ControllerConfig" - }, - "controllers": { - "description": "Controllers is a list of the controllers that should be started. If set to \"none\", no controllers will start automatically. The default value is \"*\" which will start all controllers. When using \"*\", you may exclude controllers by prepending a \"-\" in front of their name. No other values are recognized at this time.", - "type": "string", - "default": "" - }, - "corsAllowedOrigins": { - "description": "CORSAllowedOrigins", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleExternalLogLink" } }, - "dnsConfig": { - "description": "DNSConfig, if present start the DNS server in this process", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.DNSConfig" - }, - "etcdClientInfo": { - "description": "EtcdClientInfo contains information about how to connect to etcd", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.EtcdConnectionInfo" - }, - "etcdConfig": { - "description": "EtcdConfig, if present start etcd in this process", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.EtcdConfig" - }, - "etcdStorageConfig": { - "description": "EtcdStorageConfig contains information about how API resources are stored in Etcd. These values are only relevant when etcd is the backing store for the cluster.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.EtcdStorageConfig" - }, - "imageConfig": { - "description": "ImageConfig holds options that describe how to build image names for system components", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ImageConfig" - }, - "imagePolicyConfig": { - "description": "ImagePolicyConfig controls limits and behavior for importing images", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ImagePolicyConfig" - }, - "jenkinsPipelineConfig": { - "description": "JenkinsPipelineConfig holds information about the default Jenkins template used for JenkinsPipeline build strategy.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.JenkinsPipelineConfig" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "kubeletClientInfo": { - "description": "KubeletClientInfo contains information about how to connect to kubelets", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.KubeletConnectionInfo" - }, - "kubernetesMasterConfig": { - "description": "KubernetesMasterConfig, if present start the kubernetes master in this process", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.KubernetesMasterConfig" - }, - "masterClients": { - "description": "MasterClients holds all the client connection information for controllers and other system components", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.MasterClients" - }, - "masterPublicURL": { - "description": "MasterPublicURL is how clients can access the OpenShift API server", - "type": "string", - "default": "" - }, - "networkConfig": { - "description": "NetworkConfig to be passed to the compiled in network plugin", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.MasterNetworkConfig" - }, - "oauthConfig": { - "description": "OAuthConfig, if present start the /oauth endpoint in this process", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.OAuthConfig" - }, - "policyConfig": { - "description": "PolicyConfig holds information about where to locate critical pieces of bootstrapping policy", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.PolicyConfig" - }, - "projectConfig": { - "description": "ProjectConfig holds information about project creation and defaults", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ProjectConfig" - }, - "routingConfig": { - "description": "RoutingConfig holds information about routing and route generation", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.RoutingConfig" - }, - "serviceAccountConfig": { - "description": "ServiceAccountConfig holds options related to service accounts", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ServiceAccountConfig" - }, - "servingInfo": { - "description": "ServingInfo describes how to start serving", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.HTTPServingInfo" - }, - "volumeConfig": { - "description": "MasterVolumeConfig contains options for configuring volume plugins in the master node.", + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.MasterVolumeConfig" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "MasterConfig", + "Kind": "ConsoleExternalLogLinkList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.MasterNetworkConfig": { - "description": "MasterNetworkConfig to be passed to the compiled in network plugin", + "io.openshift.console.v1.ConsoleExternalLogLinkSpec": { + "description": "ConsoleExternalLogLinkSpec is the desired log link configuration. The log link will appear on the logs tab of the pod details page.", "type": "object", "required": [ - "networkPluginName", - "clusterNetworks", - "serviceNetworkCIDR", - "externalIPNetworkCIDRs", - "ingressIPNetworkCIDR" + "text", + "hrefTemplate" ], "properties": { - "clusterNetworkCIDR": { - "description": "ClusterNetworkCIDR is the CIDR string to specify the global overlay network's L3 space. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.", - "type": "string" - }, - "clusterNetworks": { - "description": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then ClusterNetworkCIDR and HostSubnetLength may not be set.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ClusterNetworkEntry" - } - }, - "externalIPNetworkCIDRs": { - "description": "ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP may be set. It may contain a list of CIDRs which are checked for access. If a CIDR is prefixed with !, IPs in that CIDR will be rejected. Rejections will be applied first, then the IP checked against one of the allowed CIDRs. You should ensure this range does not overlap with your nodes, pods, or service CIDRs for security reasons.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "hostSubnetLength": { - "description": "HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.", - "type": "integer", - "format": "int64" - }, - "ingressIPNetworkCIDR": { - "description": "IngressIPNetworkCIDR controls the range to assign ingress ips from for services of type LoadBalancer on bare metal. If empty, ingress ips will not be assigned. It may contain a single CIDR that will be allocated from. For security reasons, you should ensure that this range does not overlap with the CIDRs reserved for external ips, nodes, pods, or services.", + "hrefTemplate": { + "description": "hrefTemplate is an absolute secure URL (must use https) for the log link including variables to be replaced. Variables are specified in the URL with the format ${variableName}, for instance, ${containerName} and will be replaced with the corresponding values from the resource. Resource is a pod. Supported variables are: - ${resourceName} - name of the resource which containes the logs - ${resourceUID} - UID of the resource which contains the logs\n - e.g. `11111111-2222-3333-4444-555555555555`\n- ${containerName} - name of the resource's container that contains the logs - ${resourceNamespace} - namespace of the resource that contains the logs - ${resourceNamespaceUID} - namespace UID of the resource that contains the logs - ${podLabels} - JSON representation of labels matching the pod with the logs\n - e.g. `{\"key1\":\"value1\",\"key2\":\"value2\"}`\n\ne.g., https://example.com/logs?resourceName=${resourceName}\u0026containerName=${containerName}\u0026resourceNamespace=${resourceNamespace}\u0026podLabels=${podLabels}", "type": "string", "default": "" }, - "networkPluginName": { - "description": "NetworkPluginName is the name of the network plugin to use", - "type": "string", - "default": "" + "namespaceFilter": { + "description": "namespaceFilter is a regular expression used to restrict a log link to a matching set of namespaces (e.g., `^openshift-`). The string is converted into a regular expression using the JavaScript RegExp constructor. If not specified, links will be displayed for all the namespaces.", + "type": "string" }, - "serviceNetworkCIDR": { - "description": "ServiceNetwork is the CIDR string to specify the service networks", + "text": { + "description": "text is the display text for the link", "type": "string", "default": "" - }, - "vxlanPort": { - "description": "VXLANPort is the VXLAN port used by the cluster defaults. If it is not set, 4789 is the default value", - "type": "integer", - "format": "int64" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "MasterNetworkConfig", + "Kind": "ConsoleExternalLogLinkSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.MasterVolumeConfig": { - "description": "MasterVolumeConfig contains options for configuring volume plugins in the master node.", + "io.openshift.console.v1.ConsoleLink": { + "description": "ConsoleLink is an extension for customizing OpenShift web console links.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "dynamicProvisioningEnabled" + "spec" ], "properties": { - "dynamicProvisioningEnabled": { - "description": "DynamicProvisioningEnabled is a boolean that toggles dynamic provisioning off when false, defaults to true", - "type": "boolean" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleLinkSpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "MasterVolumeConfig", - "Scope": "Namespaced" + "Kind": "ConsoleLink", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.NamedCertificate": { - "description": "NamedCertificate specifies a certificate/key, and the names it should be served for", + "io.openshift.console.v1.ConsoleLinkList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "names", - "certFile", - "keyFile" + "metadata", + "items" ], "properties": { - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "names": { - "description": "Names is a list of DNS names this certificate should be used to secure A name can be a normal DNS name, or can contain leading wildcard segments.", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleLink" } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "NamedCertificate", + "Kind": "ConsoleLinkList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.NodeAuthConfig": { - "description": "NodeAuthConfig holds authn/authz configuration options", + "io.openshift.console.v1.ConsoleLinkSpec": { + "description": "ConsoleLinkSpec is the desired console link configuration.", "type": "object", "required": [ - "authenticationCacheTTL", - "authenticationCacheSize", - "authorizationCacheTTL", - "authorizationCacheSize" + "text", + "href", + "location" ], "properties": { - "authenticationCacheSize": { - "description": "AuthenticationCacheSize indicates how many authentication results should be cached. If 0, the default cache size is used.", - "type": "integer", - "format": "int32", - "default": 0 + "applicationMenu": { + "description": "applicationMenu holds information about section and icon used for the link in the application menu, and it is applicable only when location is set to ApplicationMenu.", + "$ref": "#/definitions/io.openshift.console.v1.ApplicationMenuSpec" }, - "authenticationCacheTTL": { - "description": "AuthenticationCacheTTL indicates how long an authentication result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get the default timeout. If zero (e.g. \"0m\"), caching is disabled", + "href": { + "description": "href is the absolute secure URL for the link (must use https)", "type": "string", "default": "" }, - "authorizationCacheSize": { - "description": "AuthorizationCacheSize indicates how many authorization results should be cached. If 0, the default cache size is used.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "authorizationCacheTTL": { - "description": "AuthorizationCacheTTL indicates how long an authorization result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get the default timeout. If zero (e.g. \"0m\"), caching is disabled", + "location": { + "description": "location determines which location in the console the link will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "NodeAuthConfig", + }, + "namespaceDashboard": { + "description": "namespaceDashboard holds information about namespaces in which the dashboard link should appear, and it is applicable only when location is set to NamespaceDashboard. If not specified, the link will appear in all namespaces.", + "$ref": "#/definitions/io.openshift.console.v1.NamespaceDashboardSpec" + }, + "text": { + "description": "text is the display text for the link", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "console.openshift.io", + "Version": "v1", + "Kind": "ConsoleLinkSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.NodeConfig": { - "description": "NodeConfig is the fully specified config starting an OpenShift node\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ConsoleNotification": { + "description": "ConsoleNotification is the extension for configuring openshift web console notifications.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "nodeName", - "nodeIP", - "servingInfo", - "masterKubeConfig", - "masterClientConnectionOverrides", - "dnsDomain", - "dnsIP", - "dnsBindAddress", - "dnsNameservers", - "dnsRecursiveResolvConf", - "networkConfig", - "volumeDirectory", - "imageConfig", - "allowDisabledDocker", - "podManifestConfig", - "authConfig", - "dockerConfig", - "iptablesSyncPeriod", - "enableUnidling", - "volumeConfig" + "spec" ], "properties": { - "allowDisabledDocker": { - "description": "AllowDisabledDocker if true, the Kubelet will ignore errors from Docker. This means that a node can start on a machine that doesn't have docker started.", - "type": "boolean", - "default": false - }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "authConfig": { - "description": "AuthConfig holds authn/authz configuration options", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.NodeAuthConfig" - }, - "dnsBindAddress": { - "description": "DNSBindAddress is the ip:port to serve DNS on. If this is not set, the DNS server will not be started. Because most DNS resolvers will only listen on port 53, if you select an alternative port you will need a DNS proxy like dnsmasq to answer queries for containers. A common configuration is dnsmasq configured on a node IP listening on 53 and delegating queries for dnsDomain to this process, while sending other queries to the host environments nameservers.", - "type": "string", - "default": "" - }, - "dnsDomain": { - "description": "DNSDomain holds the domain suffix that will be used for the DNS search path inside each container. Defaults to 'cluster.local'.", - "type": "string", - "default": "" - }, - "dnsIP": { - "description": "DNSIP is the IP address that pods will use to access cluster DNS. Defaults to the service IP of the Kubernetes master. This IP must be listening on port 53 for compatibility with libc resolvers (which cannot be configured to resolve names from any other port). When running more complex local DNS configurations, this is often set to the local address of a DNS proxy like dnsmasq, which then will consult either the local DNS (see dnsBindAddress) or the master DNS.", - "type": "string", - "default": "" - }, - "dnsNameservers": { - "description": "DNSNameservers is a list of ip:port values of recursive nameservers to forward queries to when running a local DNS server if dnsBindAddress is set. If this value is empty, the DNS server will default to the nameservers listed in /etc/resolv.conf. If you have configured dnsmasq or another DNS proxy on the system, this value should be set to the upstream nameservers dnsmasq resolves with.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "dnsRecursiveResolvConf": { - "description": "DNSRecursiveResolvConf is a path to a resolv.conf file that contains settings for an upstream server. Only the nameservers and port fields are used. The file must exist and parse correctly. It adds extra nameservers to DNSNameservers if set.", - "type": "string", - "default": "" - }, - "dockerConfig": { - "description": "DockerConfig holds Docker related configuration options.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.DockerConfig" - }, - "enableUnidling": { - "description": "EnableUnidling controls whether or not the hybrid unidling proxy will be set up", - "type": "boolean" - }, - "imageConfig": { - "description": "ImageConfig holds options that describe how to build image names for system components", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ImageConfig" - }, - "iptablesSyncPeriod": { - "description": "IPTablesSyncPeriod is how often iptable rules are refreshed", - "type": "string", - "default": "" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "kubeletArguments": { - "description": "KubeletArguments are key value pairs that will be passed directly to the Kubelet that match the Kubelet's command line arguments. These are not migrated or validated, so if you use them they may become invalid. These values override other settings in NodeConfig which may cause invalid configurations.", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "masterClientConnectionOverrides": { - "description": "MasterClientConnectionOverrides provides overrides to the client connection used to connect to the master.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ClientConnectionOverrides" - }, - "masterKubeConfig": { - "description": "MasterKubeConfig is a filename for the .kubeconfig file that describes how to connect this node to the master", - "type": "string", - "default": "" - }, - "networkConfig": { - "description": "NetworkConfig provides network options for the node", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.NodeNetworkConfig" - }, - "networkPluginName": { - "description": "Deprecated and maintained for backward compatibility, use NetworkConfig.NetworkPluginName instead", - "type": "string" - }, - "nodeIP": { - "description": "Node may have multiple IPs, specify the IP to use for pod traffic routing If not specified, network parse/lookup on the nodeName is performed and the first non-loopback address is used", - "type": "string", - "default": "" - }, - "nodeName": { - "description": "NodeName is the value used to identify this particular node in the cluster. If possible, this should be your fully qualified hostname. If you're describing a set of static nodes to the master, this value must match one of the values in the list", - "type": "string", - "default": "" - }, - "podManifestConfig": { - "description": "PodManifestConfig holds the configuration for enabling the Kubelet to create pods based from a manifest file(s) placed locally on the node", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.PodManifestConfig" - }, - "proxyArguments": { - "description": "ProxyArguments are key value pairs that will be passed directly to the Proxy that match the Proxy's command line arguments. These are not migrated or validated, so if you use them they may become invalid. These values override other settings in NodeConfig which may cause invalid configurations.", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "servingInfo": { - "description": "ServingInfo describes how to start serving", + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.ServingInfo" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "volumeConfig": { - "description": "VolumeConfig contains options for configuring volumes on the node.", + "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.NodeVolumeConfig" - }, - "volumeDirectory": { - "description": "VolumeDirectory is the directory that volumes will be stored under", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.console.v1.ConsoleNotificationSpec" } }, "x-fabric8-info": { "Type": "object", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "NodeConfig", - "Scope": "Namespaced" + "Kind": "ConsoleNotification", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.NodeNetworkConfig": { - "description": "NodeNetworkConfig provides network options for the node", + "io.openshift.console.v1.ConsoleNotificationList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "networkPluginName", - "mtu" + "metadata", + "items" ], "properties": { - "mtu": { - "description": "Maximum transmission unit for the network packets", - "type": "integer", - "format": "int64", - "default": 0 + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "networkPluginName": { - "description": "NetworkPluginName is a string specifying the networking plugin", - "type": "string", - "default": "" + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleNotification" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "NodeNetworkConfig", + "Kind": "ConsoleNotificationList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.NodeVolumeConfig": { - "description": "NodeVolumeConfig contains options for configuring volumes on the node.", + "io.openshift.console.v1.ConsoleNotificationSpec": { + "description": "ConsoleNotificationSpec is the desired console notification configuration.", "type": "object", "required": [ - "localQuota" + "text" ], "properties": { - "localQuota": { - "description": "LocalQuota contains options for controlling local volume quota on the node.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LocalQuota" + "backgroundColor": { + "description": "backgroundColor is the color of the background for the notification as CSS data type color.", + "type": "string" + }, + "color": { + "description": "color is the color of the text for the notification as CSS data type color.", + "type": "string" + }, + "link": { + "description": "link is an object that holds notification link details.", + "$ref": "#/definitions/io.openshift.console.v1.Link" + }, + "location": { + "description": "location is the location of the notification in the console. Valid values are: \"BannerTop\", \"BannerBottom\", \"BannerTopBottom\".", + "type": "string" + }, + "text": { + "description": "text is the visible text of the notification.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "NodeVolumeConfig", + "Kind": "ConsoleNotificationSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.OAuthConfig": { - "description": "OAuthConfig holds the necessary configuration options for OAuth authentication", + "io.openshift.console.v1.ConsolePlugin": { + "description": "ConsolePlugin is an extension for customizing OpenShift web console by dynamically loading code from another service running on the cluster.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "masterCA", - "masterURL", - "masterPublicURL", - "assetPublicURL", - "alwaysShowProviderSelection", - "identityProviders", - "grantConfig", - "sessionConfig", - "tokenConfig", - "templates" + "metadata", + "spec" ], "properties": { - "alwaysShowProviderSelection": { - "description": "AlwaysShowProviderSelection will force the provider selection page to render even when there is only a single provider.", - "type": "boolean", - "default": false - }, - "assetPublicURL": { - "description": "AssetPublicURL is used for building valid client redirect URLs for external access", - "type": "string", - "default": "" - }, - "grantConfig": { - "description": "GrantConfig describes how to handle grants", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.GrantConfig" - }, - "identityProviders": { - "description": "IdentityProviders is an ordered list of ways for a user to identify themselves", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.IdentityProvider" - } - }, - "masterCA": { - "description": "MasterCA is the CA for verifying the TLS connection back to the MasterURL.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "masterPublicURL": { - "description": "MasterPublicURL is used for building valid client redirect URLs for internal and external access", - "type": "string", - "default": "" - }, - "masterURL": { - "description": "MasterURL is used for making server-to-server calls to exchange authorization codes for access tokens", - "type": "string", - "default": "" - }, - "sessionConfig": { - "description": "SessionConfig hold information about configuring sessions.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.SessionConfig" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "templates": { - "description": "Templates allow you to customize pages like the login page.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.OAuthTemplates" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "tokenConfig": { - "description": "TokenConfig contains options for authorization and access tokens", + "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.TokenConfig" + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginSpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "OAuthConfig", - "Scope": "Namespaced" + "Kind": "ConsolePlugin", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.OAuthTemplates": { - "description": "OAuthTemplates allow for customization of pages like the login page", + "io.openshift.console.v1.ConsolePluginBackend": { + "description": "ConsolePluginBackend holds information about the endpoint which serves the console's plugin", "type": "object", "required": [ - "login", - "providerSelection", - "error" + "type" ], "properties": { - "error": { - "description": "Error is a path to a file containing a go template used to render error pages during the authentication or grant flow If unspecified, the default error page is used.", - "type": "string", - "default": "" - }, - "login": { - "description": "Login is a path to a file containing a go template used to render the login page. If unspecified, the default login page is used.", - "type": "string", - "default": "" + "service": { + "description": "service is a Kubernetes Service that exposes the plugin using a deployment with an HTTP server. The Service must use HTTPS and Service serving certificate. The console backend will proxy the plugins assets from the Service using the service CA bundle.", + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginService" }, - "providerSelection": { - "description": "ProviderSelection is a path to a file containing a go template used to render the provider selection page. If unspecified, the default provider selection page is used.", + "type": { + "description": "type is the backend type which servers the console's plugin. Currently only \"Service\" is supported.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "OAuthTemplates", + "Kind": "ConsolePluginBackend", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "service": "Service" + } + } + ] }, - "io.openshift.legacyconfig.v1.OpenIDClaims": { - "description": "OpenIDClaims contains a list of OpenID claims to use when authenticating with an OpenID identity provider", + "io.openshift.console.v1.ConsolePluginI18n": { + "description": "ConsolePluginI18n holds information on localization resources that are served by the dynamic plugin.", "type": "object", "required": [ - "id", - "preferredUsername", - "name", - "email" + "loadType" ], "properties": { - "email": { - "description": "Email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "id": { - "description": "ID is the list of claims whose values should be used as the user ID. Required. OpenID standard identity claim is \"sub\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "name": { - "description": "Name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "preferredUsername": { - "description": "PreferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the id claim", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "loadType": { + "description": "loadType indicates how the plugin's localization resource should be loaded. Valid values are Preload, Lazy and the empty string. When set to Preload, all localization resources are fetched when the plugin is loaded. When set to Lazy, localization resources are lazily loaded as and when they are required by the console. When omitted or set to the empty string, the behaviour is equivalent to Lazy type.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "OpenIDClaims", + "Kind": "ConsolePluginI18n", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.OpenIDIdentityProvider": { - "description": "OpenIDIdentityProvider provides identities for users authenticating using OpenID credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ConsolePluginList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "ca", - "clientID", - "clientSecret", - "extraScopes", - "extraAuthorizeParameters", - "urls", - "claims" + "metadata", + "items" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ca": { - "description": "CA is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" - }, - "claims": { - "description": "Claims mappings", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.OpenIDClaims" - }, - "clientID": { - "description": "ClientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "ClientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.StringSource" - }, - "extraAuthorizeParameters": { - "description": "ExtraAuthorizeParameters are any custom parameters to add to the authorize request.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "extraScopes": { - "description": "ExtraScopes are any scopes to request in addition to the standard \"openid\" scope.", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsolePlugin" } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "urls": { - "description": "URLs to use to authenticate", + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.OpenIDURLs" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "OpenIDIdentityProvider", + "Kind": "ConsolePluginList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.OpenIDURLs": { - "description": "OpenIDURLs are URLs to use when authenticating with an OpenID identity provider", + "io.openshift.console.v1.ConsolePluginProxy": { + "description": "ConsolePluginProxy holds information on various service types to which console's backend will proxy the plugin's requests.", "type": "object", "required": [ - "authorize", - "token", - "userInfo" + "endpoint", + "alias" ], "properties": { - "authorize": { - "description": "Authorize is the oauth authorization URL", + "alias": { + "description": "alias is a proxy name that identifies the plugin's proxy. An alias name should be unique per plugin. The console backend exposes following proxy endpoint:\n\n/api/proxy/plugin/\u003cplugin-name\u003e/\u003cproxy-alias\u003e/\u003crequest-path\u003e?\u003coptional-query-parameters\u003e\n\nRequest example path:\n\n/api/proxy/plugin/acm/search/pods?namespace=openshift-apiserver", "type": "string", "default": "" }, - "token": { - "description": "Token is the oauth token granting URL", - "type": "string", - "default": "" + "authorization": { + "description": "authorization provides information about authorization type, which the proxied request should contain", + "type": "string" }, - "userInfo": { - "description": "UserInfo is the optional userinfo URL. If present, a granted access_token is used to request claims If empty, a granted id_token is parsed for claims", - "type": "string", - "default": "" + "caCertificate": { + "description": "caCertificate provides the cert authority certificate contents, in case the proxied Service is using custom service CA. By default, the service CA bundle provided by the service-ca operator is used.", + "type": "string" + }, + "endpoint": { + "description": "endpoint provides information about endpoint to which the request is proxied to.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginProxyEndpoint" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "OpenIDURLs", + "Kind": "ConsolePluginProxy", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.PodManifestConfig": { - "description": "PodManifestConfig holds the necessary configuration options for using pod manifests", + "io.openshift.console.v1.ConsolePluginProxyEndpoint": { + "description": "ConsolePluginProxyEndpoint holds information about the endpoint to which request will be proxied to.", "type": "object", "required": [ - "path", - "fileCheckIntervalSeconds" + "type" ], "properties": { - "fileCheckIntervalSeconds": { - "description": "FileCheckIntervalSeconds is the interval in seconds for checking the manifest file(s) for new data The interval needs to be a positive value", - "type": "integer", - "format": "int64", - "default": 0 + "service": { + "description": "service is an in-cluster Service that the plugin will connect to. The Service must use HTTPS. The console backend exposes an endpoint in order to proxy communication between the plugin and the Service. Note: service field is required for now, since currently only \"Service\" type is supported.", + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginProxyServiceConfig" }, - "path": { - "description": "Path specifies the path for the pod manifest file or directory If its a directory, its expected to contain on or more manifest files This is used by the Kubelet to create pods on the node", + "type": { + "description": "type is the type of the console plugin's proxy. Currently only \"Service\" is supported.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "PodManifestConfig", + "Kind": "ConsolePluginProxyEndpoint", "Scope": "Namespaced" - } - }, - "io.openshift.legacyconfig.v1.PolicyConfig": { - "description": "holds the necessary configuration options for", - "type": "object", - "required": [ - "userAgentMatchingConfig" - ], - "properties": { - "userAgentMatchingConfig": { - "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.UserAgentMatchingConfig" - } }, - "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "PolicyConfig", - "Scope": "Namespaced" - } + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "service": "Service" + } + } + ] }, - "io.openshift.legacyconfig.v1.ProjectConfig": { - "description": "holds the necessary configuration options for", + "io.openshift.console.v1.ConsolePluginProxyServiceConfig": { + "description": "ProxyTypeServiceConfig holds information on Service to which console's backend will proxy the plugin's requests.", "type": "object", "required": [ - "defaultNodeSelector", - "projectRequestMessage", - "projectRequestTemplate", - "securityAllocator" + "name", + "namespace", + "port" ], "properties": { - "defaultNodeSelector": { - "description": "DefaultNodeSelector holds default project node label selector", - "type": "string", - "default": "" - }, - "projectRequestMessage": { - "description": "ProjectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint", + "name": { + "description": "name of Service that the plugin needs to connect to.", "type": "string", "default": "" }, - "projectRequestTemplate": { - "description": "ProjectRequestTemplate is the template to use for creating projects in response to projectrequest. It is in the format namespace/template and it is optional. If it is not specified, a default template is used.", + "namespace": { + "description": "namespace of Service that the plugin needs to connect to", "type": "string", "default": "" }, - "securityAllocator": { - "description": "SecurityAllocator controls the automatic allocation of UIDs and MCS labels to a project. If nil, allocation is disabled.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.SecurityAllocator" + "port": { + "description": "port on which the Service that the plugin needs to connect to is listening on.", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "ProjectConfig", + "Kind": "ConsolePluginProxyServiceConfig", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.RFC2307Config": { - "description": "RFC2307Config holds the necessary configuration options to define how an LDAP group sync interacts with an LDAP server using the RFC2307 schema", + "io.openshift.console.v1.ConsolePluginService": { + "description": "ConsolePluginService holds information on Service that is serving console dynamic plugin assets.", "type": "object", "required": [ - "groupsQuery", - "groupUIDAttribute", - "groupNameAttributes", - "groupMembershipAttributes", - "usersQuery", - "userUIDAttribute", - "userNameAttributes", - "tolerateMemberNotFoundErrors", - "tolerateMemberOutOfScopeErrors" + "name", + "namespace", + "port" ], "properties": { - "groupMembershipAttributes": { - "description": "GroupMembershipAttributes defines which attributes on an LDAP group entry will be interpreted as its members. The values contained in those attributes must be queryable by your UserUIDAttribute", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "groupNameAttributes": { - "description": "GroupNameAttributes defines which attributes on an LDAP group entry will be interpreted as its name to use for an OpenShift group", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "groupUIDAttribute": { - "description": "GroupUIDAttributes defines which attribute on an LDAP group entry will be interpreted as its unique identifier. (ldapGroupUID)", + "basePath": { + "description": "basePath is the path to the plugin's assets. The primary asset it the manifest file called `plugin-manifest.json`, which is a JSON document that contains metadata about the plugin and the extensions.", "type": "string", "default": "" }, - "groupsQuery": { - "description": "AllGroupsQuery holds the template for an LDAP query that returns group entries.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LDAPQuery" - }, - "tolerateMemberNotFoundErrors": { - "description": "TolerateMemberNotFoundErrors determines the behavior of the LDAP sync job when missing user entries are encountered. If 'true', an LDAP query for users that doesn't find any will be tolerated and an only and error will be logged. If 'false', the LDAP sync job will fail if a query for users doesn't find any. The default value is 'false'. Misconfigured LDAP sync jobs with this flag set to 'true' can cause group membership to be removed, so it is recommended to use this flag with caution.", - "type": "boolean", - "default": false - }, - "tolerateMemberOutOfScopeErrors": { - "description": "TolerateMemberOutOfScopeErrors determines the behavior of the LDAP sync job when out-of-scope user entries are encountered. If 'true', an LDAP query for a user that falls outside of the base DN given for the all user query will be tolerated and only an error will be logged. If 'false', the LDAP sync job will fail if a user query would search outside of the base DN specified by the all user query. Misconfigured LDAP sync jobs with this flag set to 'true' can result in groups missing users, so it is recommended to use this flag with caution.", - "type": "boolean", - "default": false - }, - "userNameAttributes": { - "description": "UserNameAttributes defines which attributes on an LDAP user entry will be used, in order, as its OpenShift user name. The first attribute with a non-empty value is used. This should match your PreferredUsername setting for your LDAPPasswordIdentityProvider", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "name": { + "description": "name of Service that is serving the plugin assets.", + "type": "string", + "default": "" }, - "userUIDAttribute": { - "description": "UserUIDAttribute defines which attribute on an LDAP user entry will be interpreted as its unique identifier. It must correspond to values that will be found from the GroupMembershipAttributes", + "namespace": { + "description": "namespace of Service that is serving the plugin assets.", "type": "string", "default": "" }, - "usersQuery": { - "description": "AllUsersQuery holds the template for an LDAP query that returns user entries.", - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.LDAPQuery" + "port": { + "description": "port on which the Service that is serving the plugin is listening to.", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "RFC2307Config", + "Kind": "ConsolePluginService", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.RegistryLocation": { - "description": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.", + "io.openshift.console.v1.ConsolePluginSpec": { + "description": "ConsolePluginSpec is the desired plugin configuration.", "type": "object", "required": [ - "domainName" + "displayName", + "backend" ], "properties": { - "domainName": { - "description": "DomainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.", + "backend": { + "description": "backend holds the configuration of backend which is serving console's plugin .", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginBackend" + }, + "displayName": { + "description": "displayName is the display name of the plugin. The dispalyName should be between 1 and 128 characters.", "type": "string", "default": "" }, - "insecure": { - "description": "Insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.", - "type": "boolean" + "i18n": { + "description": "i18n is the configuration of plugin's localization resources.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginI18n" + }, + "proxy": { + "description": "proxy is a list of proxies that describe various service type to which the plugin needs to connect to.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsolePluginProxy" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "RegistryLocation", + "Kind": "ConsolePluginSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.RemoteConnectionInfo": { - "description": "RemoteConnectionInfo holds information necessary for establishing a remote connection", + "io.openshift.console.v1.ConsoleQuickStart": { + "description": "ConsoleQuickStart is an extension for guiding user through various workflows in the OpenShift web console.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "url", - "ca", - "certFile", - "keyFile" + "spec" ], "properties": { - "ca": { - "description": "CA is the CA for verifying TLS connections", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "url": { - "description": "URL is the remote URL to connect to", - "type": "string", - "default": "" + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartSpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "RemoteConnectionInfo", - "Scope": "Namespaced" + "Kind": "ConsoleQuickStart", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.RequestHeaderAuthenticationOptions": { - "description": "RequestHeaderAuthenticationOptions provides options for setting up a front proxy against the entire API instead of against the /oauth endpoint.", + "io.openshift.console.v1.ConsoleQuickStartList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "clientCA", - "clientCommonNames", - "usernameHeaders", - "groupHeaders", - "extraHeaderPrefixes" + "metadata", + "items" ], "properties": { - "clientCA": { - "description": "ClientCA is a file with the trusted signer certs. It is required.", - "type": "string", - "default": "" - }, - "clientCommonNames": { - "description": "ClientCommonNames is a required list of common names to require a match from.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "extraHeaderPrefixes": { - "description": "ExtraHeaderPrefixes is the set of request header prefixes to inspect for user extra. X-Remote-Extra- is suggested.", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStart" } }, - "groupHeaders": { - "description": "GroupNameHeader is the set of headers to check for group information. All are unioned.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "usernameHeaders": { - "description": "UsernameHeaders is the list of headers to check for user information. First hit wins.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "RequestHeaderAuthenticationOptions", + "Kind": "ConsoleQuickStartList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.RequestHeaderIdentityProvider": { - "description": "RequestHeaderIdentityProvider provides identities for users authenticating using request header credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ConsoleQuickStartSpec": { + "description": "ConsoleQuickStartSpec is the desired quick start configuration.", "type": "object", "required": [ - "loginURL", - "challengeURL", - "clientCA", - "clientCommonNames", - "headers", - "preferredUsernameHeaders", - "nameHeaders", - "emailHeaders" + "displayName", + "durationMinutes", + "description", + "introduction", + "tasks" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "accessReviewResources": { + "description": "accessReviewResources contains a list of resources that the user's access will be reviewed against in order for the user to complete the Quick Start. The Quick Start will be hidden if any of the access reviews fail.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.authorization.v1.ResourceAttributes" + } + }, + "conclusion": { + "description": "conclusion sums up the Quick Start and suggests the possible next steps. (includes markdown)", "type": "string" }, - "challengeURL": { - "description": "ChallengeURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect WWW-Authenticate challenges will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", + "description": { + "description": "description is the description of the Quick Start. (includes markdown)", "type": "string", "default": "" }, - "clientCA": { - "description": "ClientCA is a file with the trusted signer certs. If empty, no request verification is done, and any direct request to the OAuth server can impersonate any identity from this provider, merely by setting a request header.", + "displayName": { + "description": "displayName is the display name of the Quick Start.", "type": "string", "default": "" }, - "clientCommonNames": { - "description": "ClientCommonNames is an optional list of common names to require a match from. If empty, any client certificate validated against the clientCA bundle is considered authoritative.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "durationMinutes": { + "description": "durationMinutes describes approximately how many minutes it will take to complete the Quick Start.", + "type": "integer", + "format": "int32", + "default": 0 }, - "emailHeaders": { - "description": "EmailHeaders is the set of headers to check for the email address", + "icon": { + "description": "icon is a base64 encoded image that will be displayed beside the Quick Start display name. The icon should be an vector image for easy scaling. The size of the icon should be 40x40.", + "type": "string" + }, + "introduction": { + "description": "introduction describes the purpose of the Quick Start. (includes markdown)", + "type": "string", + "default": "" + }, + "nextQuickStart": { + "description": "nextQuickStart is a list of the following Quick Starts, suggested for the user to try.", "type": "array", "items": { "type": "string", "default": "" } }, - "headers": { - "description": "Headers is the set of headers to check for identity information", + "prerequisites": { + "description": "prerequisites contains all prerequisites that need to be met before taking a Quick Start. (includes markdown)", "type": "array", "items": { "type": "string", "default": "" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "loginURL": { - "description": "LoginURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect interactive logins will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", - "type": "string", - "default": "" - }, - "nameHeaders": { - "description": "NameHeaders is the set of headers to check for the display name", + "tags": { + "description": "tags is a list of strings that describe the Quick Start.", "type": "array", "items": { "type": "string", "default": "" } }, - "preferredUsernameHeaders": { - "description": "PreferredUsernameHeaders is the set of headers to check for the preferred username", + "tasks": { + "description": "tasks is the list of steps the user has to perform to complete the Quick Start.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartTask" } } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "RequestHeaderIdentityProvider", + "Kind": "ConsoleQuickStartSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.RoutingConfig": { - "description": "RoutingConfig holds the necessary configuration options for routing to subdomains", + "io.openshift.console.v1.ConsoleQuickStartTask": { + "description": "ConsoleQuickStartTask is a single step in a Quick Start.", "type": "object", "required": [ - "subdomain" + "title", + "description" ], "properties": { - "subdomain": { - "description": "Subdomain is the suffix appended to $service.$namespace. to form the default route hostname DEPRECATED: This field is being replaced by routers setting their own defaults. This is the \"default\" route.", + "description": { + "description": "description describes the steps needed to complete the task. (includes markdown)", + "type": "string", + "default": "" + }, + "review": { + "description": "review contains instructions to validate the task is complete. The user will select 'Yes' or 'No'. using a radio button, which indicates whether the step was completed successfully.", + "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartTaskReview" + }, + "summary": { + "description": "summary contains information about the passed step.", + "$ref": "#/definitions/io.openshift.console.v1.ConsoleQuickStartTaskSummary" + }, + "title": { + "description": "title describes the task and is displayed as a step heading.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "RoutingConfig", + "Kind": "ConsoleQuickStartTask", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.SecurityAllocator": { - "description": "SecurityAllocator controls the automatic allocation of UIDs and MCS labels to a project. If nil, allocation is disabled.", + "io.openshift.console.v1.ConsoleQuickStartTaskReview": { + "description": "ConsoleQuickStartTaskReview contains instructions that validate a task was completed successfully.", "type": "object", "required": [ - "uidAllocatorRange", - "mcsAllocatorRange", - "mcsLabelsPerProject" + "instructions", + "failedTaskHelp" ], "properties": { - "mcsAllocatorRange": { - "description": "MCSAllocatorRange defines the range of MCS categories that will be assigned to namespaces. The format is \"\u003cprefix\u003e/\u003cnumberOfLabels\u003e[,\u003cmaxCategory\u003e]\". The default is \"s0/2\" and will allocate from c0 -\u003e c1023, which means a total of 535k labels are available (1024 choose 2 ~ 535k). If this value is changed after startup, new projects may receive labels that are already allocated to other projects. Prefix may be any valid SELinux set of terms (including user, role, and type), although leaving them as the default will allow the server to set them automatically.\n\nExamples: * s0:/2 - Allocate labels from s0:c0,c0 to s0:c511,c511 * s0:/2,512 - Allocate labels from s0:c0,c0,c0 to s0:c511,c511,511", + "failedTaskHelp": { + "description": "failedTaskHelp contains suggestions for a failed task review and is shown at the end of task. (includes markdown)", "type": "string", "default": "" }, - "mcsLabelsPerProject": { - "description": "MCSLabelsPerProject defines the number of labels that should be reserved per project. The default is 5 to match the default UID and MCS ranges (100k namespaces, 535k/5 labels).", - "type": "integer", - "format": "int32", - "default": 0 - }, - "uidAllocatorRange": { - "description": "UIDAllocatorRange defines the total set of Unix user IDs (UIDs) that will be allocated to projects automatically, and the size of the block each namespace gets. For example, 1000-1999/10 will allocate ten UIDs per namespace, and will be able to allocate up to 100 blocks before running out of space. The default is to allocate from 1 billion to 2 billion in 10k blocks (which is the expected size of the ranges container images will use once user namespaces are started).", + "instructions": { + "description": "instructions contains steps that user needs to take in order to validate his work after going through a task. (includes markdown)", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "SecurityAllocator", + "Kind": "ConsoleQuickStartTaskReview", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ServiceAccountConfig": { - "description": "ServiceAccountConfig holds the necessary configuration options for a service account", + "io.openshift.console.v1.ConsoleQuickStartTaskSummary": { + "description": "ConsoleQuickStartTaskSummary contains information about a passed step.", "type": "object", "required": [ - "managedNames", - "limitSecretReferences", - "privateKeyFile", - "publicKeyFiles", - "masterCA" + "success", + "failed" ], "properties": { - "limitSecretReferences": { - "description": "LimitSecretReferences controls whether or not to allow a service account to reference any secret in a namespace without explicitly referencing them", - "type": "boolean", - "default": false - }, - "managedNames": { - "description": "ManagedNames is a list of service account names that will be auto-created in every namespace. If no names are specified, the ServiceAccountsController will not be started.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "masterCA": { - "description": "MasterCA is the CA for verifying the TLS connection back to the master. The service account controller will automatically inject the contents of this file into pods so they can verify connections to the master.", + "failed": { + "description": "failed briefly describes the unsuccessfully passed task. (includes markdown)", "type": "string", "default": "" }, - "privateKeyFile": { - "description": "PrivateKeyFile is a file containing a PEM-encoded private RSA key, used to sign service account tokens. If no private key is specified, the service account TokensController will not be started.", + "success": { + "description": "success describes the succesfully passed task.", "type": "string", "default": "" - }, - "publicKeyFiles": { - "description": "PublicKeyFiles is a list of files, each containing a PEM-encoded public RSA key. (If any file contains a private key, the public portion of the key is used) The list of public keys is used to verify presented service account tokens. Each key is tried in order until the list is exhausted or verification succeeds. If no keys are specified, no service account authentication will be available.", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "ServiceAccountConfig", + "Kind": "ConsoleQuickStartTaskSummary", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.ServiceServingCert": { - "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", + "io.openshift.console.v1.ConsoleSample": { + "description": "ConsoleSample is an extension to customizing OpenShift web console by adding samples.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "signer" + "metadata", + "spec" ], "properties": { - "signer": { - "description": "Signer holds the signing information used to automatically sign serving certificates. If this value is nil, then certs are not signed automatically.", - "$ref": "#/definitions/io.openshift.legacyconfig.v1.CertInfo" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec contains configuration for a console sample.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleSpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "ServiceServingCert", - "Scope": "Namespaced" + "Kind": "ConsoleSample", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.ServingInfo": { - "description": "ServingInfo holds information about serving web pages", + "io.openshift.console.v1.ConsoleSampleContainerImportSource": { + "description": "ConsoleSampleContainerImportSource let the user import a container image.", "type": "object", "required": [ - "bindAddress", - "bindNetwork", - "certFile", - "keyFile", - "clientCA", - "namedCertificates" + "image" ], "properties": { - "bindAddress": { - "description": "BindAddress is the ip:port to serve on", - "type": "string", - "default": "" - }, - "bindNetwork": { - "description": "BindNetwork is the type of network to bind to - defaults to \"tcp4\", accepts \"tcp\", \"tcp4\", and \"tcp6\"", + "image": { + "description": "reference to a container image that provides a HTTP service. The service must be exposed on the default port (8080) unless otherwise configured with the port field.\n\nSupported formats:\n - \u003crepository-name\u003e/\u003cimage-name\u003e\n - docker.io/\u003crepository-name\u003e/\u003cimage-name\u003e\n - quay.io/\u003crepository-name\u003e/\u003cimage-name\u003e\n - quay.io/\u003crepository-name\u003e/\u003cimage-name\u003e@sha256:\u003cimage hash\u003e\n - quay.io/\u003crepository-name\u003e/\u003cimage-name\u003e:\u003ctag\u003e", "type": "string", "default": "" }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "cipherSuites": { - "description": "CipherSuites contains an overridden list of ciphers for the server to support. Values must match cipher suite IDs from https://golang.org/pkg/crypto/tls/#pkg-constants", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "clientCA": { - "description": "ClientCA is the certificate bundle for all the signers that you'll recognize for incoming client certificates", - "type": "string", - "default": "" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" - }, - "minTLSVersion": { - "description": "MinTLSVersion is the minimum TLS version supported. Values must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants", - "type": "string" - }, - "namedCertificates": { - "description": "NamedCertificates is a list of certificates to use to secure requests to specific hostnames", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.NamedCertificate" - } + "service": { + "description": "service contains configuration for the Service resource created for this sample.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleContainerImportSourceService" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "ServingInfo", + "Kind": "ConsoleSampleContainerImportSource", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.SessionConfig": { - "description": "SessionConfig specifies options for cookie-based sessions. Used by AuthRequestHandlerSession", + "io.openshift.console.v1.ConsoleSampleContainerImportSourceService": { + "description": "ConsoleSampleContainerImportSourceService let the samples author define defaults for the Service created for this sample.", "type": "object", - "required": [ - "sessionSecretsFile", - "sessionMaxAgeSeconds", - "sessionName" - ], "properties": { - "sessionMaxAgeSeconds": { - "description": "SessionMaxAgeSeconds specifies how long created sessions last. Used by AuthRequestHandlerSession", + "targetPort": { + "description": "targetPort is the port that the service listens on for HTTP requests. This port will be used for Service and Route created for this sample. Port must be in the range 1 to 65535. Default port is 8080.", "type": "integer", - "format": "int32", - "default": 0 - }, - "sessionName": { - "description": "SessionName is the cookie name used to store the session", - "type": "string", - "default": "" - }, - "sessionSecretsFile": { - "description": "SessionSecretsFile is a reference to a file containing a serialized SessionSecrets object If no file is specified, a random signing and encryption key are generated at each server start", - "type": "string", - "default": "" + "format": "int32" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "SessionConfig", + "Kind": "ConsoleSampleContainerImportSourceService", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.SessionSecret": { - "description": "SessionSecret is a secret used to authenticate/decrypt cookie-based sessions", + "io.openshift.console.v1.ConsoleSampleGitImportSource": { + "description": "ConsoleSampleGitImportSource let the user import code from a public Git repository.", "type": "object", "required": [ - "authentication", - "encryption" + "repository" ], "properties": { - "authentication": { - "description": "Authentication is used to authenticate sessions using HMAC. Recommended to use a secret with 32 or 64 bytes.", - "type": "string", - "default": "" + "repository": { + "description": "repository contains the reference to the actual Git repository.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleGitImportSourceRepository" }, - "encryption": { - "description": "Encryption is used to encrypt sessions. Must be 16, 24, or 32 characters long, to select AES-128, AES-", - "type": "string", - "default": "" + "service": { + "description": "service contains configuration for the Service resource created for this sample.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleGitImportSourceService" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "SessionSecret", + "Kind": "ConsoleSampleGitImportSource", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.SessionSecrets": { - "description": "SessionSecrets list the secrets to use to sign/encrypt and authenticate/decrypt created sessions.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.console.v1.ConsoleSampleGitImportSourceRepository": { + "description": "ConsoleSampleGitImportSourceRepository let the user import code from a public git repository.", "type": "object", "required": [ - "secrets" + "url" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "contextDir": { + "description": "contextDir is used to specify a directory within the repository to build the component. Must start with `/` and have a maximum length of 256 characters. When omitted, the default value is to build from the root of the repository.", + "type": "string", + "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "revision": { + "description": "revision is the git revision at which to clone the git repository Can be used to clone a specific branch, tag or commit SHA. Must be at most 256 characters in length. When omitted the repository's default branch is used.", + "type": "string", + "default": "" }, - "secrets": { - "description": "Secrets is a list of secrets New sessions are signed and encrypted using the first secret. Existing sessions are decrypted/authenticated by each secret until one succeeds. This allows rotating secrets.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.SessionSecret" - } + "url": { + "description": "url of the Git repository that contains a HTTP service. The HTTP service must be exposed on the default port (8080) unless otherwise configured with the port field.\n\nOnly public repositories on GitHub, GitLab and Bitbucket are currently supported:\n\n - https://github.com/\u003corg\u003e/\u003crepository\u003e\n - https://gitlab.com/\u003corg\u003e/\u003crepository\u003e\n - https://bitbucket.org/\u003corg\u003e/\u003crepository\u003e\n\nThe url must have a maximum length of 256 characters.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "legacy.config.openshift.io", + "Type": "nested", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "SessionSecrets", + "Kind": "ConsoleSampleGitImportSourceRepository", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.SourceStrategyDefaultsConfig": { - "description": "SourceStrategyDefaultsConfig contains values that apply to builds using the source strategy.", + "io.openshift.console.v1.ConsoleSampleGitImportSourceService": { + "description": "ConsoleSampleGitImportSourceService let the samples author define defaults for the Service created for this sample.", "type": "object", "properties": { - "incremental": { - "description": "incremental indicates if s2i build strategies should perform an incremental build or not", - "type": "boolean" + "targetPort": { + "description": "targetPort is the port that the service listens on for HTTP requests. This port will be used for Service created for this sample. Port must be in the range 1 to 65535. Default port is 8080.", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "SourceStrategyDefaultsConfig", + "Kind": "ConsoleSampleGitImportSourceService", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.StringSource": { - "description": "StringSource allows specifying a string inline, or externally via env var or file. When it contains only a string value, it marshals to a simple JSON string.", + "io.openshift.console.v1.ConsoleSampleList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "value", - "env", - "file", - "keyFile" + "metadata", + "items" ], "properties": { - "env": { - "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "file": { - "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", - "type": "string", - "default": "" + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSample" + } }, - "keyFile": { - "description": "KeyFile references a file containing the key to use to decrypt the value.", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "value": { - "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "StringSource", + "Kind": "ConsoleSampleList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.StringSourceSpec": { - "description": "StringSourceSpec specifies a string value, or external location", + "io.openshift.console.v1.ConsoleSampleSource": { + "description": "ConsoleSampleSource is the actual sample definition and can hold different sample types. Unsupported sample types will be ignored in the web console.", "type": "object", "required": [ - "value", - "env", - "file", - "keyFile" + "type" ], "properties": { - "env": { - "description": "Env specifies an envvar containing the cleartext value, or an encrypted value if the keyFile is specified.", - "type": "string", - "default": "" - }, - "file": { - "description": "File references a file containing the cleartext value, or an encrypted value if a keyFile is specified.", - "type": "string", - "default": "" + "containerImport": { + "description": "containerImport allows the user import a container image.", + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleContainerImportSource" }, - "keyFile": { - "description": "KeyFile references a file containing the key to use to decrypt the value.", - "type": "string", - "default": "" + "gitImport": { + "description": "gitImport allows the user to import code from a git repository.", + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleGitImportSource" }, - "value": { - "description": "Value specifies the cleartext value, or an encrypted value if keyFile is specified.", + "type": { + "description": "type of the sample, currently supported: \"GitImport\";\"ContainerImport\"", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "StringSourceSpec", + "Kind": "ConsoleSampleSource", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "containerImport": "ContainerImport", + "gitImport": "GitImport" + } + } + ] }, - "io.openshift.legacyconfig.v1.TokenConfig": { - "description": "TokenConfig holds the necessary configuration options for authorization and access tokens", + "io.openshift.console.v1.ConsoleSampleSpec": { + "description": "ConsoleSampleSpec is the desired sample for the web console. Samples will appear with their title, descriptions and a badge in a samples catalog.", "type": "object", "required": [ - "authorizeTokenMaxAgeSeconds", - "accessTokenMaxAgeSeconds" + "title", + "abstract", + "description", + "source" ], "properties": { - "accessTokenInactivityTimeoutSeconds": { - "description": "AccessTokenInactivityTimeoutSeconds defined the default token inactivity timeout for tokens granted by any client. Setting it to nil means the feature is completely disabled (default) The default setting can be overriden on OAuthClient basis. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. Valid values are: - 0: Tokens never time out - X: Tokens time out if there is no activity for X seconds The current minimum allowed value for X is 300 (5 minutes)", - "type": "integer", - "format": "int32" + "abstract": { + "description": "abstract is a short introduction to the sample.\n\nIt is required and must be no more than 100 characters in length.\n\nThe abstract is shown on the sample card tile below the title and provider and is limited to three lines of content.", + "type": "string", + "default": "" }, - "accessTokenMaxAgeSeconds": { - "description": "AccessTokenMaxAgeSeconds defines the maximum age of access tokens", - "type": "integer", - "format": "int32", - "default": 0 + "description": { + "description": "description is a long form explanation of the sample.\n\nIt is required and can have a maximum length of **4096** characters.\n\nIt is a README.md-like content for additional information, links, pre-conditions, and other instructions. It will be rendered as Markdown so that it can contain line breaks, links, and other simple formatting.", + "type": "string", + "default": "" }, - "authorizeTokenMaxAgeSeconds": { - "description": "AuthorizeTokenMaxAgeSeconds defines the maximum age of authorize tokens", - "type": "integer", - "format": "int32", - "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "TokenConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.legacyconfig.v1.UserAgentDenyRule": { - "description": "UserAgentDenyRule adds a rejection message that can be used to help a user figure out how to get an approved client", - "type": "object", - "required": [ - "regex", - "httpVerbs", - "rejectionMessage" - ], - "properties": { - "httpVerbs": { - "description": "HTTPVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", + "icon": { + "description": "icon is an optional base64 encoded image and shown beside the sample title.\n\nThe format must follow the data: URL format and can have a maximum size of **10 KB**.\n\n data:[\u003cmediatype\u003e][;base64],\u003cbase64 encoded image\u003e\n\nFor example:\n\n data:image;base64, plus the base64 encoded image.\n\nVector images can also be used. SVG icons must start with:\n\n data:image/svg+xml;base64, plus the base64 encoded SVG image.\n\nAll sample catalog icons will be shown on a white background (also when the dark theme is used). The web console ensures that different aspect ratios work correctly. Currently, the surface of the icon is at most 40x100px.\n\nFor more information on the data URL format, please visit https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URLs.", + "type": "string", + "default": "" + }, + "provider": { + "description": "provider is an optional label to honor who provides the sample.\n\nIt is optional and must be no more than 50 characters in length.\n\nA provider can be a company like \"Red Hat\" or an organization like \"CNCF\" or \"Knative\".\n\nCurrently, the provider is only shown on the sample card tile below the title with the prefix \"Provided by \"", + "type": "string", + "default": "" + }, + "source": { + "description": "source defines where to deploy the sample service from. The sample may be sourced from an external git repository or container image.", + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleSampleSource" + }, + "tags": { + "description": "tags are optional string values that can be used to find samples in the samples catalog.\n\nExamples of common tags may be \"Java\", \"Quarkus\", etc.\n\nThey will be displayed on the samples details page.", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "set" }, - "regex": { - "description": "UserAgentRegex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", + "title": { + "description": "title is the display name of the sample.\n\nIt is required and must be no more than 50 characters in length.", "type": "string", "default": "" }, - "rejectionMessage": { - "description": "RejectionMessage is the message shown when rejecting a client. If it is not a set, the default message is used.", + "type": { + "description": "type is an optional label to group multiple samples.\n\nIt is optional and must be no more than 20 characters in length.\n\nRecommendation is a singular term like \"Builder Image\", \"Devfile\" or \"Serverless Function\".\n\nCurrently, the type is shown a badge on the sample card tile in the top right corner.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "legacy.config.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "UserAgentDenyRule", + "Kind": "ConsoleSampleSpec", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.UserAgentMatchRule": { - "description": "UserAgentMatchRule describes how to match a given request based on User-Agent and HTTPVerb", + "io.openshift.console.v1.ConsoleYAMLSample": { + "description": "ConsoleYAMLSample is an extension for customizing OpenShift web console YAML samples.\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "regex", - "httpVerbs" + "metadata", + "spec" ], "properties": { - "httpVerbs": { - "description": "HTTPVerbs specifies which HTTP verbs should be matched. An empty list means \"match all verbs\".", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "regex": { - "description": "UserAgentRegex is a regex that is checked against the User-Agent. Known variants of oc clients 1. oc accessing kube resources: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d 2. oc accessing openshift resources: oc/v1.1.3 (linux/amd64) openshift/b348c2f 3. openshift kubectl accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 4. openshift kubectl accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f 5. oadm accessing kube resources: oadm/v1.2.0 (linux/amd64) kubernetes/bc4550d 6. oadm accessing openshift resources: oadm/v1.1.3 (linux/amd64) openshift/b348c2f 7. openshift cli accessing kube resources: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d 8. openshift cli accessing openshift resources: openshift/v1.1.3 (linux/amd64) openshift/b348c2f", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.console.v1.ConsoleYAMLSampleSpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "UserAgentMatchRule", - "Scope": "Namespaced" + "Kind": "ConsoleYAMLSample", + "Scope": "Clustered" } }, - "io.openshift.legacyconfig.v1.UserAgentMatchingConfig": { - "description": "UserAgentMatchingConfig controls how API calls from *voluntarily* identifying clients will be handled. THIS DOES NOT DEFEND AGAINST MALICIOUS CLIENTS!", + "io.openshift.console.v1.ConsoleYAMLSampleList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "requiredClients", - "deniedClients", - "defaultRejectionMessage" + "metadata", + "items" ], "properties": { - "defaultRejectionMessage": { - "description": "DefaultRejectionMessage is the message shown when rejecting a client. If it is not a set, a generic message is given.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "deniedClients": { - "description": "If this list is non-empty, then a User-Agent must not match any of the UserAgentRegexes", + "items": { "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.UserAgentDenyRule" + "$ref": "#/definitions/io.openshift.console.v1.ConsoleYAMLSample" } }, - "requiredClients": { - "description": "If this list is non-empty, then a User-Agent must match one of the UserAgentRegexes to be allowed", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.legacyconfig.v1.UserAgentMatchRule" - } + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", + "Type": "list", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "UserAgentMatchingConfig", + "Kind": "ConsoleYAMLSampleList", "Scope": "Namespaced" } }, - "io.openshift.legacyconfig.v1.WebhookTokenAuthenticator": { - "description": "WebhookTokenAuthenticators holds the necessary configuation options for external token authenticators", + "io.openshift.console.v1.ConsoleYAMLSampleSpec": { + "description": "ConsoleYAMLSampleSpec is the desired YAML sample configuration. Samples will appear with their descriptions in a samples sidebar when creating a resources in the web console.", "type": "object", "required": [ - "configFile", - "cacheTTL" + "targetResource", + "title", + "description", + "yaml" ], "properties": { - "cacheTTL": { - "description": "CacheTTL indicates how long an authentication result should be cached. It takes a valid time duration string (e.g. \"5m\"). If empty, you get a default timeout of 2 minutes. If zero (e.g. \"0m\"), caching is disabled", + "description": { + "description": "description of the YAML sample.", "type": "string", "default": "" }, - "configFile": { - "description": "ConfigFile is a path to a Kubeconfig file with the webhook configuration", + "snippet": { + "description": "snippet indicates that the YAML sample is not the full YAML resource definition, but a fragment that can be inserted into the existing YAML document at the user's cursor.", + "type": "boolean", + "default": false + }, + "targetResource": { + "description": "targetResource contains apiVersion and kind of the resource YAML sample is representating.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.TypeMeta" + }, + "title": { + "description": "title of the YAML sample.", "type": "string", "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "legacy.config.openshift.io", - "Version": "v1", - "Kind": "WebhookTokenAuthenticator", - "Scope": "Namespaced" - } - }, - "io.openshift.machine.v1.AWSFailureDomain": { - "description": "AWSFailureDomain configures failure domain information for the AWS platform.", - "type": "object", - "properties": { - "placement": { - "description": "Placement configures the placement information for this instance.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AWSFailureDomainPlacement" }, - "subnet": { - "description": "Subnet is a reference to the subnet to use for this instance.", - "$ref": "#/definitions/io.openshift.machine.v1.AWSResourceReference" + "yaml": { + "description": "yaml is the YAML sample to display.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", + "Type": "object", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "AWSFailureDomain", + "Kind": "ConsoleYAMLSampleSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.AWSFailureDomainPlacement": { - "description": "AWSFailureDomainPlacement configures the placement information for the AWSFailureDomain.", + "io.openshift.console.v1.Link": { + "description": "Represents a standard link that could be generated in HTML", "type": "object", "required": [ - "availabilityZone" + "text", + "href" ], "properties": { - "availabilityZone": { - "description": "AvailabilityZone is the availability zone of the instance.", + "href": { + "description": "href is the absolute secure URL for the link (must use https)", + "type": "string", + "default": "" + }, + "text": { + "description": "text is the display text for the link", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "AWSFailureDomainPlacement", + "Kind": "Link", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.AWSResourceFilter": { - "description": "AWSResourceFilter is a filter used to identify an AWS resource", + "io.openshift.console.v1.NamespaceDashboardSpec": { + "description": "NamespaceDashboardSpec is a specification of namespaces in which the dashboard link should appear. If both namespaces and namespaceSelector are specified, the link will appear in namespaces that match either", "type": "object", - "required": [ - "name" - ], "properties": { - "name": { - "description": "Name of the filter. Filter names are case-sensitive.", - "type": "string", - "default": "" + "namespaceSelector": { + "description": "namespaceSelector is used to select the Namespaces that should contain dashboard link by label. If the namespace labels match, dashboard link will be shown for the namespaces.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "values": { - "description": "Values includes one or more filter values. Filter values are case-sensitive.", + "namespaces": { + "description": "namespaces is an array of namespace names in which the dashboard link should appear.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", + "Group": "console.openshift.io", "Version": "v1", - "Kind": "AWSResourceFilter", + "Kind": "NamespaceDashboardSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.AWSResourceReference": { - "description": "AWSResourceReference is a reference to a specific AWS resource by ID, ARN, or filters. Only one of ID, ARN or Filters may be specified. Specifying more than one will result in a validation error.", + "io.openshift.example.v1.CELUnion": { + "description": "CELUnion demonstrates how to use a discriminated union and how to validate it using CEL.", "type": "object", - "required": [ - "type" - ], "properties": { - "arn": { - "description": "ARN of resource.", + "optionalMember": { + "description": "optionalMember is a union member that is optional.", "type": "string" }, - "filters": { - "description": "Filters is a set of filters used to identify a resource.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AWSResourceFilter" - }, - "x-kubernetes-list-type": "atomic" - }, - "id": { - "description": "ID of resource.", + "requiredMember": { + "description": "requiredMember is a union member that is required.", "type": "string" }, "type": { - "description": "Type determines how the reference will fetch the AWS resource.", - "type": "string", - "default": "" + "description": "type determines which of the union members should be populated.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", + "Group": "example.openshift.io", "Version": "v1", - "Kind": "AWSResourceReference", + "Kind": "CELUnion", "Scope": "Namespaced" }, "x-kubernetes-unions": [ { "discriminator": "type", "fields-to-discriminateBy": { - "arn": "ARN", - "filters": "Filters", - "id": "ID" + "optionalMember": "OptionalMember", + "requiredMember": "RequiredMember" } } ] }, - "io.openshift.machine.v1.AlibabaCloudMachineProviderConfig": { - "description": "AlibabaCloudMachineProviderConfig is the Schema for the alibabacloudmachineproviderconfig API Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.example.v1.EvolvingUnion": { + "type": "object", + "properties": { + "type": { + "description": "type is the discriminator. It has different values for Default and for TechPreviewNoUpgrade", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "example.openshift.io", + "Version": "v1", + "Kind": "EvolvingUnion", + "Scope": "Namespaced" + } + }, + "io.openshift.example.v1.StableConfigType": { + "description": "StableConfigType is a stable config type that may include TechPreviewNoUpgrade fields.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "instanceType", - "vpcId", - "regionId", - "zoneId", - "imageId", - "vSwitch", - "resourceGroup" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "bandwidth": { - "description": "Bandwidth describes the internet bandwidth strategy for the instance", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.BandwidthProperties" - }, - "credentialsSecret": { - "description": "CredentialsSecret is a reference to the secret with alibabacloud credentials. Otherwise, defaults to permissions provided by attached RAM role where the actuator is running.", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" - }, - "dataDisk": { - "description": "DataDisks holds information regarding the extra disks attached to the instance", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.DataDiskProperties" - } - }, - "imageId": { - "description": "The ID of the image used to create the instance.", - "type": "string", - "default": "" - }, - "instanceType": { - "description": "The instance type of the instance.", - "type": "string", - "default": "" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" @@ -34624,75 +34304,27 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "ramRoleName": { - "description": "RAMRoleName is the name of the instance Resource Access Management (RAM) role. This allows the instance to perform API calls as this specified RAM role.", - "type": "string" - }, - "regionId": { - "description": "The ID of the region in which to create the instance. You can call the DescribeRegions operation to query the most recent region list.", - "type": "string", - "default": "" - }, - "resourceGroup": { - "description": "ResourceGroup references the resource group to which to assign the instance. A reference holds either the resource group ID, the resource name, or the required tags to search. When more than one resource group are returned for a search, an error will be produced and the Machine will not be created. Resource Groups do not support searching by tags.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AlibabaResourceReference" - }, - "securityGroups": { - "description": "SecurityGroups is a list of security group references to assign to the instance. A reference holds either the security group ID, the resource name, or the required tags to search. When more than one security group is returned for a tag search, all the groups are associated with the instance up to the maximum number of security groups to which an instance can belong. For more information, see the \"Security group limits\" section in Limits. https://www.alibabacloud.com/help/en/doc-detail/25412.htm", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AlibabaResourceReference" - } - }, - "systemDisk": { - "description": "SystemDisk holds the properties regarding the system disk for the instance", + "spec": { + "description": "spec is the specification of the desired behavior of the StableConfigType.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.SystemDiskProperties" - }, - "tag": { - "description": "Tags are the set of metadata to add to an instance.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.Tag" - } - }, - "tenancy": { - "description": "Tenancy specifies whether to create the instance on a dedicated host. Valid values:\n\ndefault: creates the instance on a non-dedicated host. host: creates the instance on a dedicated host. If you do not specify the DedicatedHostID parameter, Alibaba Cloud automatically selects a dedicated host for the instance. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `default`.", - "type": "string" - }, - "userDataSecret": { - "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + "$ref": "#/definitions/io.openshift.example.v1.StableConfigTypeSpec" }, - "vSwitch": { - "description": "VSwitch is a reference to the vswitch to use for this instance. A reference holds either the vSwitch ID, the resource name, or the required tags to search. When more than one vSwitch is returned for a tag search, only the first vSwitch returned will be used. This parameter is required when you create an instance of the VPC type. You can call the DescribeVSwitches operation to query the created vSwitches.", + "status": { + "description": "status is the most recently observed status of the StableConfigType.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AlibabaResourceReference" - }, - "vpcId": { - "description": "The ID of the vpc", - "type": "string", - "default": "" - }, - "zoneId": { - "description": "The ID of the zone in which to create the instance. You can call the DescribeZones operation to query the most recent region list.", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.example.v1.StableConfigTypeStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machine.openshift.io", + "Group": "example.openshift.io", "Version": "v1", - "Kind": "AlibabaCloudMachineProviderConfig", - "Scope": "Namespaced" + "Kind": "StableConfigType", + "Scope": "Clustered" } }, - "io.openshift.machine.v1.AlibabaCloudMachineProviderConfigList": { - "description": "AlibabaCloudMachineProviderConfigList contains a list of AlibabaCloudMachineProviderConfig Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.example.v1.StableConfigTypeList": { + "description": "StableConfigTypeList contains a list of StableConfigTypes.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -34706,7 +34338,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AlibabaCloudMachineProviderConfig" + "$ref": "#/definitions/io.openshift.example.v1.StableConfigType" } }, "kind": { @@ -34721,141 +34353,114 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "machine.openshift.io", + "Group": "example.openshift.io", "Version": "v1", - "Kind": "AlibabaCloudMachineProviderConfigList", + "Kind": "StableConfigTypeList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.AlibabaCloudMachineProviderStatus": { - "description": "AlibabaCloudMachineProviderStatus is the Schema for the alibabacloudmachineproviderconfig API Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.example.v1.StableConfigTypeSpec": { + "description": "StableConfigTypeSpec is the desired state", "type": "object", + "required": [ + "immutableField" + ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "celUnion": { + "description": "celUnion demonstrates how to validate a discrminated union using CEL", + "default": {}, + "$ref": "#/definitions/io.openshift.example.v1.CELUnion" }, - "conditions": { - "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status", + "coolNewField": { + "description": "coolNewField is a field that is for tech preview only. On normal clusters this shouldn't be present", + "type": "string", + "default": "" + }, + "evolvingCollection": { + "description": "evolvingCollection demonstrates how to have a collection where the maximum number of items varies on cluster type. For default clusters, this will be \"1\" but on TechPreview clusters, this value will be \"3\".", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - } - }, - "instanceId": { - "description": "InstanceID is the instance ID of the machine created in alibabacloud", - "type": "string" + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "instanceState": { - "description": "InstanceState is the state of the alibabacloud instance for this machine", - "type": "string" + "evolvingUnion": { + "description": "evolvingUnion demonstrates how to phase in new values into discriminated union", + "default": {}, + "$ref": "#/definitions/io.openshift.example.v1.EvolvingUnion" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "immutableField": { + "description": "immutableField is a field that is immutable once the object has been created. It is required at all times.", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "AlibabaCloudMachineProviderStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.machine.v1.AlibabaResourceReference": { - "description": "ResourceTagReference is a reference to a specific AlibabaCloud resource by ID, or tags. Only one of ID or Tags may be specified. Specifying more than one will result in a validation error.", - "type": "object", - "required": [ - "type" - ], - "properties": { - "id": { - "description": "ID of resource", - "type": "string" + "nonZeroDefault": { + "description": "nonZeroDefault is a demonstration of creating an integer field that has a non zero default. It required two default tags (one for CRD generation, one for client generation) and must have `omitempty` and be optional. A minimum value is added to demonstrate that a zero value would not be accepted.", + "type": "integer", + "format": "int32", + "default": 8 }, - "name": { - "description": "Name of the resource", - "type": "string" + "optionalImmutableField": { + "description": "optionalImmutableField is a field that is immutable once set. It is optional but may not be changed once set.", + "type": "string", + "default": "" }, - "tags": { - "description": "Tags is a set of metadata based upon ECS object tags used to identify a resource. For details about usage when multiple resources are found, please see the owning parent field documentation.", + "set": { + "description": "set demonstrates how to define and validate set of strings", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.Tag" + "type": "string", + "default": "" } }, - "type": { - "description": "type identifies the resource reference type for this entry.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "AlibabaResourceReference", - "Scope": "Namespaced" - } - }, - "io.openshift.machine.v1.AzureFailureDomain": { - "description": "AzureFailureDomain configures failure domain information for the Azure platform.", - "type": "object", - "required": [ - "zone" - ], - "properties": { - "subnet": { - "description": "subnet is the name of the network subnet in which the VM will be created. When omitted, the subnet value from the machine providerSpec template will be used.", - "type": "string" - }, - "zone": { - "description": "Availability Zone for the virtual machine. If nil, the virtual machine should be deployed to no zone.", + "stableField": { + "description": "stableField is a field that is present on default clusters and on tech preview clusters\n\nIf empty, the platform will choose a good default, which may change over time without notice.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", + "Group": "example.openshift.io", "Version": "v1", - "Kind": "AzureFailureDomain", + "Kind": "StableConfigTypeSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.BandwidthProperties": { - "description": "Bandwidth describes the bandwidth strategy for the network of the instance", + "io.openshift.example.v1.StableConfigTypeStatus": { + "description": "StableConfigTypeStatus defines the observed status of the StableConfigType.", "type": "object", "properties": { - "internetMaxBandwidthIn": { - "description": "InternetMaxBandwidthIn is the maximum inbound public bandwidth. Unit: Mbit/s. Valid values: When the purchased outbound public bandwidth is less than or equal to 10 Mbit/s, the valid values of this parameter are 1 to 10. Currently the default is `10` when outbound bandwidth is less than or equal to 10 Mbit/s. When the purchased outbound public bandwidth is greater than 10, the valid values are 1 to the InternetMaxBandwidthOut value. Currently the default is the value used for `InternetMaxBandwidthOut` when outbound public bandwidth is greater than 10.", - "type": "integer", - "format": "int64" + "conditions": { + "description": "Represents the observations of a foo's current state. Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" }, - "internetMaxBandwidthOut": { - "description": "InternetMaxBandwidthOut is the maximum outbound public bandwidth. Unit: Mbit/s. Valid values: 0 to 100. When a value greater than 0 is used then a public IP address is assigned to the instance. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `0`", - "type": "integer", - "format": "int64" + "immutableField": { + "description": "immutableField is a field that is immutable once the object has been created. It is required at all times.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", + "Group": "example.openshift.io", "Version": "v1", - "Kind": "BandwidthProperties", + "Kind": "StableConfigTypeStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.ControlPlaneMachineSet": { - "description": "ControlPlaneMachineSet ensures that a specified number of control plane machine replicas are running at any given time. Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.example.v1alpha1.NotStableConfigType": { + "description": "NotStableConfigType is a stable config type that is TechPreviewNoUpgrade only.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "properties": { "apiVersion": { @@ -34872,24 +34477,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec is the specification of the desired behavior of the NotStableConfigType.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetSpec" + "$ref": "#/definitions/io.openshift.example.v1alpha1.NotStableConfigTypeSpec" }, "status": { + "description": "status is the most recently observed status of the NotStableConfigType.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetStatus" + "$ref": "#/definitions/io.openshift.example.v1alpha1.NotStableConfigTypeStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSet", - "Scope": "Namespaced" + "Group": "example.openshift.io", + "Version": "v1alpha1", + "Kind": "NotStableConfigType", + "Scope": "Clustered" } }, - "io.openshift.machine.v1.ControlPlaneMachineSetList": { - "description": "ControlPlaneMachineSetList contains a list of ControlPlaneMachineSet Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.example.v1alpha1.NotStableConfigTypeList": { + "description": "NotStableConfigTypeList contains a list of NotStableConfigTypes.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "items" @@ -34903,7 +34510,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSet" + "$ref": "#/definitions/io.openshift.example.v1alpha1.NotStableConfigType" } }, "kind": { @@ -34918,61 +34525,39 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSetList", + "Group": "example.openshift.io", + "Version": "v1alpha1", + "Kind": "NotStableConfigTypeList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.ControlPlaneMachineSetSpec": { - "description": "ControlPlaneMachineSet represents the configuration of the ControlPlaneMachineSet.", + "io.openshift.example.v1alpha1.NotStableConfigTypeSpec": { + "description": "NotStableConfigTypeSpec is the desired state", "type": "object", "required": [ - "replicas", - "selector", - "template" + "newField" ], "properties": { - "replicas": { - "description": "Replicas defines how many Control Plane Machines should be created by this ControlPlaneMachineSet. This field is immutable and cannot be changed after cluster installation. The ControlPlaneMachineSet only operates with 3 or 5 node control planes, 3 and 5 are the only valid values for this field.", - "type": "integer", - "format": "int32" - }, - "selector": { - "description": "Label selector for Machines. Existing Machines selected by this selector will be the ones affected by this ControlPlaneMachineSet. It must match the template's labels. This field is considered immutable after creation of the resource.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - }, - "state": { - "description": "State defines whether the ControlPlaneMachineSet is Active or Inactive. When Inactive, the ControlPlaneMachineSet will not take any action on the state of the Machines within the cluster. When Active, the ControlPlaneMachineSet will reconcile the Machines and will update the Machines as necessary. Once Active, a ControlPlaneMachineSet cannot be made Inactive. To prevent further action please remove the ControlPlaneMachineSet.", + "newField": { + "description": "newField is a field that is tech preview, but because the entire type is gated, there is no marker on the field.", "type": "string", - "default": "Inactive" - }, - "strategy": { - "description": "Strategy defines how the ControlPlaneMachineSet will update Machines when it detects a change to the ProviderSpec.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetStrategy" - }, - "template": { - "description": "Template describes the Control Plane Machines that will be created by this ControlPlaneMachineSet.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetTemplate" + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSetSpec", + "Group": "example.openshift.io", + "Version": "v1alpha1", + "Kind": "NotStableConfigTypeSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.ControlPlaneMachineSetStatus": { - "description": "ControlPlaneMachineSetStatus represents the status of the ControlPlaneMachineSet CRD.", + "io.openshift.example.v1alpha1.NotStableConfigTypeStatus": { + "description": "NotStableConfigTypeStatus defines the observed status of the NotStableConfigType.", "type": "object", "properties": { "conditions": { - "description": "Conditions represents the observations of the ControlPlaneMachineSet's current state. Known .status.conditions.type are: Available, Degraded and Progressing.", + "description": "Represents the observations of a foo's current state. Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"", "type": "array", "items": { "default": {}, @@ -34984,103 +34569,2848 @@ "x-kubernetes-list-type": "map", "x-kubernetes-patch-merge-key": "type", "x-kubernetes-patch-strategy": "merge" - }, - "observedGeneration": { - "description": "ObservedGeneration is the most recent generation observed for this ControlPlaneMachineSet. It corresponds to the ControlPlaneMachineSets's generation, which is updated on mutation by the API Server.", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "ReadyReplicas is the number of Control Plane Machines created by the ControlPlaneMachineSet controller which are ready. Note that this value may be higher than the desired number of replicas while rolling updates are in-progress.", - "type": "integer", - "format": "int32" - }, - "replicas": { - "description": "Replicas is the number of Control Plane Machines created by the ControlPlaneMachineSet controller. Note that during update operations this value may differ from the desired replica count.", - "type": "integer", - "format": "int32" - }, - "unavailableReplicas": { - "description": "UnavailableReplicas is the number of Control Plane Machines that are still required before the ControlPlaneMachineSet reaches the desired available capacity. When this value is non-zero, the number of ReadyReplicas is less than the desired Replicas.", - "type": "integer", - "format": "int32" - }, - "updatedReplicas": { - "description": "UpdatedReplicas is the number of non-terminated Control Plane Machines created by the ControlPlaneMachineSet controller that have the desired provider spec and are ready. This value is set to 0 when a change is detected to the desired spec. When the update strategy is RollingUpdate, this will also coincide with starting the process of updating the Machines. When the update strategy is OnDelete, this value will remain at 0 until a user deletes an existing replica and its replacement has become ready.", - "type": "integer", - "format": "int32" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSetStatus", + "Group": "example.openshift.io", + "Version": "v1alpha1", + "Kind": "NotStableConfigTypeStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.ControlPlaneMachineSetStrategy": { - "description": "ControlPlaneMachineSetStrategy defines the strategy for applying updates to the Control Plane Machines managed by the ControlPlaneMachineSet.", + "io.openshift.helm.v1beta1.ConnectionConfig": { "type": "object", + "required": [ + "url" + ], "properties": { - "type": { - "description": "Type defines the type of update strategy that should be used when updating Machines owned by the ControlPlaneMachineSet. Valid values are \"RollingUpdate\" and \"OnDelete\". The current default value is \"RollingUpdate\".", + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca-bundle.crt\" is used to locate the data. If empty, the default system roots are used. The namespace for this config map is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "tlsClientConfig": { + "description": "tlsClientConfig is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate and private key to present when connecting to the server. The key \"tls.crt\" is used to locate the client certificate. The key \"tls.key\" is used to locate the private key. The namespace for this secret is openshift-config.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "url": { + "description": "Chart repository URL", "type": "string", - "default": "RollingUpdate" + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSetStrategy", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "ConnectionConfig", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.ControlPlaneMachineSetTemplate": { - "description": "ControlPlaneMachineSetTemplate is a template used by the ControlPlaneMachineSet to create the Machines that it will manage in the future.", + "io.openshift.helm.v1beta1.ConnectionConfigNamespaceScoped": { "type": "object", + "required": [ + "url" + ], "properties": { - "machineType": { - "description": "MachineType determines the type of Machines that should be managed by the ControlPlaneMachineSet. Currently, the only valid value is machines_v1beta1_machine_openshift_io.", - "type": "string" + "basicAuthConfig": { + "description": "basicAuthConfig is an optional reference to a secret by name that contains the basic authentication credentials to present when connecting to the server. The key \"username\" is used locate the username. The key \"password\" is used to locate the password. The namespace for this secret must be same as the namespace where the project helm chart repository is getting instantiated.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" }, - "machines_v1beta1_machine_openshift_io": { - "description": "OpenShiftMachineV1Beta1Machine defines the template for creating Machines from the v1beta1.machine.openshift.io API group.", - "$ref": "#/definitions/io.openshift.machine.v1.OpenShiftMachineV1Beta1MachineTemplate" + "ca": { + "description": "ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key \"ca-bundle.crt\" is used to locate the data. If empty, the default system roots are used. The namespace for this configmap must be same as the namespace where the project helm chart repository is getting instantiated.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "tlsClientConfig": { + "description": "tlsClientConfig is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate and private key to present when connecting to the server. The key \"tls.crt\" is used to locate the client certificate. The key \"tls.key\" is used to locate the private key. The namespace for this secret must be same as the namespace where the project helm chart repository is getting instantiated.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + }, + "url": { + "description": "Chart repository URL", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSetTemplate", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "ConnectionConfigNamespaceScoped", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "machineType", - "fields-to-discriminateBy": { - "machines_v1beta1_machine_openshift_io": "OpenShiftMachineV1Beta1Machine" - } - } - ] + } }, - "io.openshift.machine.v1.ControlPlaneMachineSetTemplateObjectMeta": { - "description": "ControlPlaneMachineSetTemplateObjectMeta is a subset of the metav1.ObjectMeta struct. It allows users to specify labels and annotations that will be copied onto Machines created from this template.", + "io.openshift.helm.v1beta1.HelmChartRepository": { + "description": "HelmChartRepository holds cluster-wide configuration for proxied Helm chart repository\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "labels" + "spec" ], "properties": { - "annotations": { - "description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepositorySpec" + }, + "status": { + "description": "Observed status of the repository within the cluster..", + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepositoryStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "HelmChartRepository", + "Scope": "Clustered" + } + }, + "io.openshift.helm.v1beta1.HelmChartRepositoryList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepository" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "HelmChartRepositoryList", + "Scope": "Namespaced" + } + }, + "io.openshift.helm.v1beta1.HelmChartRepositorySpec": { + "description": "Helm chart repository exposed within the cluster", + "type": "object", + "required": [ + "connectionConfig" + ], + "properties": { + "connectionConfig": { + "description": "Required configuration for connecting to the chart repo", + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.ConnectionConfig" + }, + "description": { + "description": "Optional human readable repository description, it can be used by UI for displaying purposes", + "type": "string" + }, + "disabled": { + "description": "If set to true, disable the repo usage in the cluster/namespace", + "type": "boolean" + }, + "name": { + "description": "Optional associated human readable repository name, it can be used by UI for displaying purposes", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "HelmChartRepositorySpec", + "Scope": "Namespaced" + } + }, + "io.openshift.helm.v1beta1.HelmChartRepositoryStatus": { + "type": "object", + "properties": { + "conditions": { + "description": "conditions is a list of conditions and their statuses", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "HelmChartRepositoryStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.helm.v1beta1.ProjectHelmChartRepository": { + "description": "ProjectHelmChartRepository holds namespace-wide configuration for proxied Helm chart repository\n\nCompatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "spec" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.ProjectHelmChartRepositorySpec" + }, + "status": { + "description": "Observed status of the repository within the namespace..", + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.HelmChartRepositoryStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "ProjectHelmChartRepository", + "Scope": "Namespaced" + } + }, + "io.openshift.helm.v1beta1.ProjectHelmChartRepositoryList": { + "description": "Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.ProjectHelmChartRepository" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "ProjectHelmChartRepositoryList", + "Scope": "Namespaced" + } + }, + "io.openshift.helm.v1beta1.ProjectHelmChartRepositorySpec": { + "description": "Project Helm chart repository exposed within a namespace", + "type": "object", + "required": [ + "connectionConfig" + ], + "properties": { + "connectionConfig": { + "description": "Required configuration for connecting to the chart repo", + "default": {}, + "$ref": "#/definitions/io.openshift.helm.v1beta1.ConnectionConfigNamespaceScoped" + }, + "description": { + "description": "Optional human readable repository description, it can be used by UI for displaying purposes", + "type": "string" + }, + "disabled": { + "description": "If set to true, disable the repo usage in the namespace", + "type": "boolean" + }, + "name": { + "description": "Optional associated human readable repository name, it can be used by UI for displaying purposes", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "helm.openshift.io", + "Version": "v1beta1", + "Kind": "ProjectHelmChartRepositorySpec", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.DockerImageReference": { + "description": "DockerImageReference points to a container image.", + "type": "object", + "required": [ + "Registry", + "Namespace", + "Name", + "Tag", + "ID" + ], + "properties": { + "ID": { + "description": "ID is the identifier for the container image", + "type": "string", + "default": "" + }, + "Name": { + "description": "Name is the name of the container image", + "type": "string", + "default": "" + }, + "Namespace": { + "description": "Namespace is the namespace that contains the container image", + "type": "string", + "default": "" + }, + "Registry": { + "description": "Registry is the registry that contains the container image", + "type": "string", + "default": "" + }, + "Tag": { + "description": "Tag is which tag of the container image is being referenced", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "DockerImageReference", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.Image": { + "description": "Image is an immutable representation of a container image and metadata at a point in time. Images are named by taking a hash of their contents (metadata and content) and any change in format, content, or metadata results in a new name. The images resource is primarily for use by cluster administrators and integrations like the cluster image registry - end users instead access images via the imagestreamtags or imagestreamimages resources. While image metadata is stored in the API, any integration that implements the container image registry API must provide its own storage for the raw manifest data, image config, and layer contents.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "dockerImageConfig": { + "description": "DockerImageConfig is a JSON blob that the runtime uses to set up the container. This is a part of manifest schema v2. Will not be set when the image represents a manifest list.", + "type": "string" + }, + "dockerImageLayers": { + "description": "DockerImageLayers represents the layers in the image. May not be set if the image does not define that data or if the image represents a manifest list.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageLayer" + } + }, + "dockerImageManifest": { + "description": "DockerImageManifest is the raw JSON of the manifest", + "type": "string" + }, + "dockerImageManifestMediaType": { + "description": "DockerImageManifestMediaType specifies the mediaType of manifest. This is a part of manifest schema v2.", + "type": "string" + }, + "dockerImageManifests": { + "description": "DockerImageManifests holds information about sub-manifests when the image represents a manifest list. When this field is present, no DockerImageLayers should be specified.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageManifest" + } + }, + "dockerImageMetadata": { + "description": "DockerImageMetadata contains metadata about this image", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension", + "x-kubernetes-patch-strategy": "replace" + }, + "dockerImageMetadataVersion": { + "description": "DockerImageMetadataVersion conveys the version of the object, which if empty defaults to \"1.0\"", + "type": "string" + }, + "dockerImageReference": { + "description": "DockerImageReference is the string that can be used to pull this image.", + "type": "string" + }, + "dockerImageSignatures": { + "description": "DockerImageSignatures provides the signatures as opaque blobs. This is a part of manifest schema v1.", + "type": "array", + "items": { + "type": "string", + "format": "byte" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "signatures": { + "description": "Signatures holds all signatures of the image.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageSignature" + }, + "x-kubernetes-patch-merge-key": "name", + "x-kubernetes-patch-strategy": "merge" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "Image", + "Scope": "Clustered" + } + }, + "io.openshift.image.v1.ImageBlobReferences": { + "description": "ImageBlobReferences describes the blob references within an image.", + "type": "object", + "properties": { + "config": { + "description": "config, if set, is the blob that contains the image config. Some images do not have separate config blobs and this field will be set to nil if so.", + "type": "string" + }, + "imageMissing": { + "description": "imageMissing is true if the image is referenced by the image stream but the image object has been deleted from the API by an administrator. When this field is set, layers and config fields may be empty and callers that depend on the image metadata should consider the image to be unavailable for download or viewing.", + "type": "boolean", + "default": false + }, + "layers": { + "description": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "manifests": { + "description": "manifests is the list of other image names that this image points to. For a single architecture image, it is empty. For a multi-arch image, it consists of the digests of single architecture images, such images shouldn't have layers nor config.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageBlobReferences", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageImportSpec": { + "description": "ImageImportSpec describes a request to import a specific image.", + "type": "object", + "required": [ + "from" + ], + "properties": { + "from": { + "description": "From is the source of an image to import; only kind DockerImage is allowed", + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + }, + "importPolicy": { + "description": "ImportPolicy is the policy controlling how the image is imported", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagImportPolicy" + }, + "includeManifest": { + "description": "IncludeManifest determines if the manifest for each image is returned in the response", + "type": "boolean" + }, + "referencePolicy": { + "description": "ReferencePolicy defines how other components should consume the image", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagReferencePolicy" + }, + "to": { + "description": "To is a tag in the current image stream to assign the imported image to, if name is not specified the default tag from from.name will be used", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageImportSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageImportStatus": { + "description": "ImageImportStatus describes the result of an image import.", + "type": "object", + "required": [ + "status" + ], + "properties": { + "image": { + "description": "Image is the metadata of that image, if the image was located", + "$ref": "#/definitions/io.openshift.image.v1.Image" + }, + "manifests": { + "description": "Manifests holds sub-manifests metadata when importing a manifest list", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.Image" + } + }, + "status": { + "description": "Status is the status of the image import, including errors encountered while retrieving the image", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status" + }, + "tag": { + "description": "Tag is the tag this image was located under, if any", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageImportStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageLayer": { + "description": "ImageLayer represents a single layer of the image. Some images may have multiple layers. Some may have none.", + "type": "object", + "required": [ + "name", + "size", + "mediaType" + ], + "properties": { + "mediaType": { + "description": "MediaType of the referenced object.", + "type": "string", + "default": "" + }, + "name": { + "description": "Name of the layer as defined by the underlying store.", + "type": "string", + "default": "" + }, + "size": { + "description": "Size of the layer in bytes as defined by the underlying store.", + "type": "integer", + "format": "int64", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageLayer", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageLayerData": { + "description": "ImageLayerData contains metadata about an image layer.", + "type": "object", + "required": [ + "size", + "mediaType" + ], + "properties": { + "mediaType": { + "description": "MediaType of the referenced object.", + "type": "string", + "default": "" + }, + "size": { + "description": "Size of the layer in bytes as defined by the underlying store. This field is optional if the necessary information about size is not available.", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageLayerData", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageList": { + "description": "ImageList is a list of Image objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items is a list of images", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.Image" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageList", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageLookupPolicy": { + "description": "ImageLookupPolicy describes how an image stream can be used to override the image references used by pods, builds, and other resources in a namespace.", + "type": "object", + "required": [ + "local" + ], + "properties": { + "local": { + "description": "local will change the docker short image references (like \"mysql\" or \"php:latest\") on objects in this namespace to the image ID whenever they match this image stream, instead of reaching out to a remote registry. The name will be fully qualified to an image ID if found. The tag's referencePolicy is taken into account on the replaced value. Only works within the current namespace.", + "type": "boolean", + "default": false + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageLookupPolicy", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageManifest": { + "description": "ImageManifest represents sub-manifests of a manifest list. The Digest field points to a regular Image object.", + "type": "object", + "required": [ + "digest", + "mediaType", + "manifestSize", + "architecture", + "os" + ], + "properties": { + "architecture": { + "description": "Architecture specifies the supported CPU architecture, for example `amd64` or `ppc64le`.", + "type": "string", + "default": "" + }, + "digest": { + "description": "Digest is the unique identifier for the manifest. It refers to an Image object.", + "type": "string", + "default": "" + }, + "manifestSize": { + "description": "ManifestSize represents the size of the raw object contents, in bytes.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "mediaType": { + "description": "MediaType defines the type of the manifest, possible values are application/vnd.oci.image.manifest.v1+json, application/vnd.docker.distribution.manifest.v2+json or application/vnd.docker.distribution.manifest.v1+json.", + "type": "string", + "default": "" + }, + "os": { + "description": "OS specifies the operating system, for example `linux`.", + "type": "string", + "default": "" + }, + "variant": { + "description": "Variant is an optional field repreenting a variant of the CPU, for example v6 to specify a particular CPU variant of the ARM CPU.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageManifest", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageSignature": { + "description": "ImageSignature holds a signature of an image. It allows to verify image identity and possibly other claims as long as the signature is trusted. Based on this information it is possible to restrict runnable images to those matching cluster-wide policy. Mandatory fields should be parsed by clients doing image verification. The others are parsed from signature's content by the server. They serve just an informative purpose.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "type", + "content" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "conditions": { + "description": "Conditions represent the latest available observations of a signature's current state.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.SignatureCondition" + }, + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "content": { + "description": "Required: An opaque binary string which is an image's signature.", + "type": "string", + "format": "byte" + }, + "created": { + "description": "If specified, it is the time of signature's creation.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "imageIdentity": { + "description": "A human readable string representing image's identity. It could be a product name and version, or an image pull spec (e.g. \"registry.access.redhat.com/rhel7/rhel:7.2\").", + "type": "string" + }, + "issuedBy": { + "description": "If specified, it holds information about an issuer of signing certificate or key (a person or entity who signed the signing certificate or key).", + "$ref": "#/definitions/io.openshift.image.v1.SignatureIssuer" + }, + "issuedTo": { + "description": "If specified, it holds information about a subject of signing certificate or key (a person or entity who signed the image).", + "$ref": "#/definitions/io.openshift.image.v1.SignatureSubject" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "signedClaims": { + "description": "Contains claims from the signature.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "type": { + "description": "Required: Describes a type of stored blob.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageSignature", + "Scope": "Clustered" + } + }, + "io.openshift.image.v1.ImageStream": { + "description": "An ImageStream stores a mapping of tags to images, metadata overrides that are applied when images are tagged in a stream, and an optional reference to a container image repository on a registry. Users typically update the spec.tags field to point to external images which are imported from container registries using credentials in your namespace with the pull secret type, or to existing image stream tags and images which are immediately accessible for tagging or pulling. The history of images applied to a tag is visible in the status.tags field and any user who can view an image stream is allowed to tag that image into their own image streams. Access to pull images from the integrated registry is granted by having the \"get imagestreams/layers\" permission on a given image stream. Users may remove a tag by deleting the imagestreamtag resource, which causes both spec and status for that tag to be removed. Image stream history is retained until an administrator runs the prune operation, which removes references that are no longer in use. To preserve a historical image, ensure there is a tag in spec pointing to that image by its digest.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "Spec describes the desired state of this stream", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageStreamSpec" + }, + "status": { + "description": "Status describes the current state of this stream", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageStreamStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStream", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamImage": { + "description": "ImageStreamImage represents an Image that is retrieved by image name from an ImageStream. User interfaces and regular users can use this resource to access the metadata details of a tagged image in the image stream history for viewing, since Image resources are not directly accessible to end users. A not found error will be returned if no such image is referenced by a tag within the ImageStream. Images are created when spec tags are set on an image stream that represent an image in an external registry, when pushing to the integrated registry, or when tagging an existing image from one image stream to another. The name of an image stream image is in the form \"\u003cSTREAM\u003e@\u003cDIGEST\u003e\", where the digest is the content addressible identifier for the image (sha256:xxxxx...). You can use ImageStreamImages as the from.kind of an image stream spec tag to reference an image exactly. The only operations supported on the imagestreamimage endpoint are retrieving the image.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "image" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "image": { + "description": "Image associated with the ImageStream and image name.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.Image" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamImage", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamImport": { + "description": "The image stream import resource provides an easy way for a user to find and import container images from other container image registries into the server. Individual images or an entire image repository may be imported, and users may choose to see the results of the import prior to tagging the resulting images into the specified image stream.\n\nThis API is intended for end-user tools that need to see the metadata of the image prior to import (for instance, to generate an application from it). Clients that know the desired image can continue to create spec.tags directly into their image streams.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "spec", + "status" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "Spec is a description of the images that the user wishes to import", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageStreamImportSpec" + }, + "status": { + "description": "Status is the result of importing the image", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageStreamImportStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamImport", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamImportSpec": { + "description": "ImageStreamImportSpec defines what images should be imported.", + "type": "object", + "required": [ + "import" + ], + "properties": { + "images": { + "description": "Images are a list of individual images to import.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageImportSpec" + } + }, + "import": { + "description": "Import indicates whether to perform an import - if so, the specified tags are set on the spec and status of the image stream defined by the type meta.", + "type": "boolean", + "default": false + }, + "repository": { + "description": "Repository is an optional import of an entire container image repository. A maximum limit on the number of tags imported this way is imposed by the server.", + "$ref": "#/definitions/io.openshift.image.v1.RepositoryImportSpec" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamImportSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamImportStatus": { + "description": "ImageStreamImportStatus contains information about the status of an image stream import.", + "type": "object", + "properties": { + "images": { + "description": "Images is set with the result of importing spec.images", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageImportStatus" + } + }, + "import": { + "description": "Import is the image stream that was successfully updated or created when 'to' was set.", + "$ref": "#/definitions/io.openshift.image.v1.ImageStream" + }, + "repository": { + "description": "Repository is set if spec.repository was set to the outcome of the import", + "$ref": "#/definitions/io.openshift.image.v1.RepositoryImportStatus" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamImportStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamLayers": { + "description": "ImageStreamLayers describes information about the layers referenced by images in this image stream.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "blobs", + "images" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "blobs": { + "description": "blobs is a map of blob name to metadata about the blob.", + "type": "object", + "additionalProperties": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageLayerData" + } + }, + "images": { + "description": "images is a map between an image name and the names of the blobs and config that comprise the image.", + "type": "object", + "additionalProperties": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageBlobReferences" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamLayers", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamList": { + "description": "ImageStreamList is a list of ImageStream objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items is a list of imageStreams", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageStream" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamList", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamMapping": { + "description": "ImageStreamMapping represents a mapping from a single image stream tag to a container image as well as the reference to the container image stream the image came from. This resource is used by privileged integrators to create an image resource and to associate it with an image stream in the status tags field. Creating an ImageStreamMapping will allow any user who can view the image stream to tag or pull that image, so only create mappings where the user has proven they have access to the image contents directly. The only operation supported for this resource is create and the metadata name and namespace should be set to the image stream containing the tag that should be updated.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "image", + "tag" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "image": { + "description": "Image is a container image.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.Image" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "tag": { + "description": "Tag is a string value this image can be located with inside the stream.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamMapping", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamSpec": { + "description": "ImageStreamSpec represents options for ImageStreams.", + "type": "object", + "properties": { + "dockerImageRepository": { + "description": "dockerImageRepository is optional, if specified this stream is backed by a container repository on this server Deprecated: This field is deprecated as of v3.7 and will be removed in a future release. Specify the source for the tags to be imported in each tag via the spec.tags.from reference instead.", + "type": "string" + }, + "lookupPolicy": { + "description": "lookupPolicy controls how other resources reference images within this namespace.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageLookupPolicy" + }, + "tags": { + "description": "tags map arbitrary string values to specific image locators", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagReference" + }, + "x-kubernetes-patch-merge-key": "name", + "x-kubernetes-patch-strategy": "merge" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamStatus": { + "description": "ImageStreamStatus contains information about the state of this image stream.", + "type": "object", + "required": [ + "dockerImageRepository" + ], + "properties": { + "dockerImageRepository": { + "description": "DockerImageRepository represents the effective location this stream may be accessed at. May be empty until the server determines where the repository is located", + "type": "string", + "default": "" + }, + "publicDockerImageRepository": { + "description": "PublicDockerImageRepository represents the public location from where the image can be pulled outside the cluster. This field may be empty if the administrator has not exposed the integrated registry externally.", + "type": "string" + }, + "tags": { + "description": "Tags are a historical record of images associated with each tag. The first entry in the TagEvent array is the currently tagged image.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.NamedTagEventList" + }, + "x-kubernetes-patch-merge-key": "tag", + "x-kubernetes-patch-strategy": "merge" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamTag": { + "description": "ImageStreamTag represents an Image that is retrieved by tag name from an ImageStream. Use this resource to interact with the tags and images in an image stream by tag, or to see the image details for a particular tag. The image associated with this resource is the most recently successfully tagged, imported, or pushed image (as described in the image stream status.tags.items list for this tag). If an import is in progress or has failed the previous image will be shown. Deleting an image stream tag clears both the status and spec fields of an image stream. If no image can be retrieved for a given tag, a not found error will be returned.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "tag", + "generation", + "lookupPolicy", + "image" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "conditions": { + "description": "conditions is an array of conditions that apply to the image stream tag.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagEventCondition" + } + }, + "generation": { + "description": "generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or conditions will be filled out indicating any error.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "image": { + "description": "image associated with the ImageStream and tag.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.Image" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "lookupPolicy": { + "description": "lookupPolicy indicates whether this tag will handle image references in this namespace.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageLookupPolicy" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "tag": { + "description": "tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.", + "$ref": "#/definitions/io.openshift.image.v1.TagReference" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamTag", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageStreamTagList": { + "description": "ImageStreamTagList is a list of ImageStreamTag objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items is the list of image stream tags", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageStreamTag" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageStreamTagList", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageTag": { + "description": "ImageTag represents a single tag within an image stream and includes the spec, the status history, and the currently referenced image (if any) of the provided tag. This type replaces the ImageStreamTag by providing a full view of the tag. ImageTags are returned for every spec or status tag present on the image stream. If no tag exists in either form a not found error will be returned by the API. A create operation will succeed if no spec tag has already been defined and the spec field is set. Delete will remove both spec and status elements from the image stream.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "spec", + "status", + "image" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "image": { + "description": "image is the details of the most recent image stream status tag, and it may be null if import has not completed or an administrator has deleted the image object. To verify this is the most recent image, you must verify the generation of the most recent status.items entry matches the spec tag (if a spec tag is set). This field will not be set when listing image tags.", + "$ref": "#/definitions/io.openshift.image.v1.Image" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.", + "$ref": "#/definitions/io.openshift.image.v1.TagReference" + }, + "status": { + "description": "status is the status tag details associated with this image stream tag, and it may be null if no push or import has been performed.", + "$ref": "#/definitions/io.openshift.image.v1.NamedTagEventList" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageTag", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.ImageTagList": { + "description": "ImageTagList is a list of ImageTag objects. When listing image tags, the image field is not populated. Tags are returned in alphabetical order by image stream and then tag.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items is the list of image stream tags", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageTag" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "ImageTagList", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.NamedTagEventList": { + "description": "NamedTagEventList relates a tag to its image history.", + "type": "object", + "required": [ + "tag", + "items" + ], + "properties": { + "conditions": { + "description": "Conditions is an array of conditions that apply to the tag event list.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagEventCondition" + } + }, + "items": { + "description": "Standard object's metadata.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagEvent" + } + }, + "tag": { + "description": "Tag is the tag for which the history is recorded", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "NamedTagEventList", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.RepositoryImportSpec": { + "description": "RepositoryImportSpec describes a request to import images from a container image repository.", + "type": "object", + "required": [ + "from" + ], + "properties": { + "from": { + "description": "From is the source for the image repository to import; only kind DockerImage and a name of a container image repository is allowed", + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + }, + "importPolicy": { + "description": "ImportPolicy is the policy controlling how the image is imported", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagImportPolicy" + }, + "includeManifest": { + "description": "IncludeManifest determines if the manifest for each image is returned in the response", + "type": "boolean" + }, + "referencePolicy": { + "description": "ReferencePolicy defines how other components should consume the image", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagReferencePolicy" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "RepositoryImportSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.RepositoryImportStatus": { + "description": "RepositoryImportStatus describes the result of an image repository import", + "type": "object", + "properties": { + "additionalTags": { + "description": "AdditionalTags are tags that exist in the repository but were not imported because a maximum limit of automatic imports was applied.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "images": { + "description": "Images is a list of images successfully retrieved by the import of the repository.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.ImageImportStatus" + } + }, + "status": { + "description": "Status reflects whether any failure occurred during import", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Status" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "RepositoryImportStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.SecretList": { + "description": "SecretList is a list of Secret.", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items is a list of secret objects. More info: https://kubernetes.io/docs/concepts/configuration/secret", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Secret" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "SecretList", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.SignatureCondition": { + "description": "SignatureCondition describes an image signature condition of particular kind at particular probe time.", + "type": "object", + "required": [ + "type", + "status" + ], + "properties": { + "lastProbeTime": { + "description": "Last time the condition was checked.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "lastTransitionTime": { + "description": "Last time the condition transit from one status to another.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "Human readable message indicating details about last transition.", + "type": "string" + }, + "reason": { + "description": "(brief) reason for the condition's last transition.", + "type": "string" + }, + "status": { + "description": "Status of the condition, one of True, False, Unknown.", + "type": "string", + "default": "" + }, + "type": { + "description": "Type of signature condition, Complete or Failed.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "SignatureCondition", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.SignatureGenericEntity": { + "description": "SignatureGenericEntity holds a generic information about a person or entity who is an issuer or a subject of signing certificate or key.", + "type": "object", + "properties": { + "commonName": { + "description": "Common name (e.g. openshift-signing-service).", + "type": "string" + }, + "organization": { + "description": "Organization name.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "SignatureGenericEntity", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.SignatureIssuer": { + "description": "SignatureIssuer holds information about an issuer of signing certificate or key.", + "type": "object", + "properties": { + "commonName": { + "description": "Common name (e.g. openshift-signing-service).", + "type": "string" + }, + "organization": { + "description": "Organization name.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "SignatureIssuer", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.SignatureSubject": { + "description": "SignatureSubject holds information about a person or entity who created the signature.", + "type": "object", + "required": [ + "publicKeyID" + ], + "properties": { + "commonName": { + "description": "Common name (e.g. openshift-signing-service).", + "type": "string" + }, + "organization": { + "description": "Organization name.", + "type": "string" + }, + "publicKeyID": { + "description": "If present, it is a human readable key id of public key belonging to the subject used to verify image signature. It should contain at least 64 lowest bits of public key's fingerprint (e.g. 0x685ebe62bf278440).", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "SignatureSubject", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.TagEvent": { + "description": "TagEvent is used by ImageStreamStatus to keep a historical record of images associated with a tag.", + "type": "object", + "required": [ + "created", + "dockerImageReference", + "image", + "generation" + ], + "properties": { + "created": { + "description": "Created holds the time the TagEvent was created", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "dockerImageReference": { + "description": "DockerImageReference is the string that can be used to pull this image", + "type": "string", + "default": "" + }, + "generation": { + "description": "Generation is the spec tag generation that resulted in this tag being updated", + "type": "integer", + "format": "int64", + "default": 0 + }, + "image": { + "description": "Image is the image", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "TagEvent", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.TagEventCondition": { + "description": "TagEventCondition contains condition information for a tag event.", + "type": "object", + "required": [ + "type", + "status", + "generation" + ], + "properties": { + "generation": { + "description": "Generation is the spec tag generation that this status corresponds to", + "type": "integer", + "format": "int64", + "default": 0 + }, + "lastTransitionTime": { + "description": "LastTransitionTIme is the time the condition transitioned from one status to another.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "Message is a human readable description of the details about last transition, complementing reason.", + "type": "string" + }, + "reason": { + "description": "Reason is a brief machine readable explanation for the condition's last transition.", + "type": "string" + }, + "status": { + "description": "Status of the condition, one of True, False, Unknown.", + "type": "string", + "default": "" + }, + "type": { + "description": "Type of tag event condition, currently only ImportSuccess", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "TagEventCondition", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.TagImportPolicy": { + "description": "TagImportPolicy controls how images related to this tag will be imported.", + "type": "object", + "properties": { + "importMode": { + "description": "ImportMode describes how to import an image manifest.", + "type": "string" + }, + "insecure": { + "description": "Insecure is true if the server may bypass certificate verification or connect directly over HTTP during image import.", + "type": "boolean" + }, + "scheduled": { + "description": "Scheduled indicates to the server that this tag should be periodically checked to ensure it is up to date, and imported", + "type": "boolean" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "TagImportPolicy", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.TagReference": { + "description": "TagReference specifies optional annotations for images using this tag and an optional reference to an ImageStreamTag, ImageStreamImage, or DockerImage this tag should track.", + "type": "object", + "required": [ + "name" + ], + "properties": { + "annotations": { + "description": "Optional; if specified, annotations that are applied to images retrieved via ImageStreamTags.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "from": { + "description": "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage. ImageStreamTag references can only reference a tag within this same ImageStream.", + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + }, + "generation": { + "description": "Generation is a counter that tracks mutations to the spec tag (user intent). When a tag reference is changed the generation is set to match the current stream generation (which is incremented every time spec is changed). Other processes in the system like the image importer observe that the generation of spec tag is newer than the generation recorded in the status and use that as a trigger to import the newest remote tag. To trigger a new import, clients may set this value to zero which will reset the generation to the latest stream generation. Legacy clients will send this value as nil which will be merged with the current tag generation.", + "type": "integer", + "format": "int64" + }, + "importPolicy": { + "description": "ImportPolicy is information that controls how images may be imported by the server.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagImportPolicy" + }, + "name": { + "description": "Name of the tag", + "type": "string", + "default": "" + }, + "reference": { + "description": "Reference states if the tag will be imported. Default value is false, which means the tag will be imported.", + "type": "boolean" + }, + "referencePolicy": { + "description": "ReferencePolicy defines how other components should consume the image.", + "default": {}, + "$ref": "#/definitions/io.openshift.image.v1.TagReferencePolicy" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "TagReference", + "Scope": "Namespaced" + } + }, + "io.openshift.image.v1.TagReferencePolicy": { + "description": "TagReferencePolicy describes how pull-specs for images in this image stream tag are generated when image change triggers in deployment configs or builds are resolved. This allows the image stream author to control how images are accessed.", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Type determines how the image pull spec should be transformed when the image stream tag is used in deployment config triggers or new builds. The default value is `Source`, indicating the original location of the image should be used (if imported). The user may also specify `Local`, indicating that the pull spec should point to the integrated container image registry and leverage the registry's ability to proxy the pull to an upstream registry. `Local` allows the credentials used to pull this image to be managed from the image stream's namespace, so others on the platform can access a remote image but have no access to the remote secret. It also allows the image layers to be mirrored into the local registry which the images can still be pulled even if the upstream registry is unavailable.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "image.openshift.io", + "Version": "v1", + "Kind": "TagReferencePolicy", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.DataGather": { + "description": "DataGather provides data gather configuration options and status for the particular Insights data gathering.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "spec" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.DataGatherSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.DataGatherStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "DataGather", + "Scope": "Clustered" + } + }, + "io.openshift.insights.v1alpha1.DataGatherList": { + "description": "DataGatherList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "items contains a list of DataGather resources.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.DataGather" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "DataGatherList", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.DataGatherSpec": { + "description": "DataGatherSpec contains the configuration for the DataGather.", + "type": "object", + "properties": { + "dataPolicy": { + "description": "dataPolicy allows user to enable additional global obfuscation of the IP addresses and base domain in the Insights archive data. Valid values are \"ClearText\" and \"ObfuscateNetworking\". When set to ClearText the data is not obfuscated. When set to ObfuscateNetworking the IP addresses and the cluster domain name are obfuscated. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is ClearText.", + "type": "string", + "default": "" + }, + "gatherers": { + "description": "gatherers is a list of gatherers configurations. The particular gatherers IDs can be found at https://github.com/openshift/insights-operator/blob/master/docs/gathered-data.md. Run the following command to get the names of last active gatherers: \"oc get insightsoperators.operator.openshift.io cluster -o json | jq '.status.gatherStatus.gatherers[].name'\"", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.GathererConfig" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "DataGatherSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.DataGatherStatus": { + "description": "DataGatherStatus contains information relating to the DataGather state.", + "type": "object", + "properties": { + "conditions": { + "description": "conditions provide details on the status of the gatherer job.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "dataGatherState": { + "description": "dataGatherState reflects the current state of the data gathering process.", + "type": "string" + }, + "finishTime": { + "description": "finishTime is the time when Insights data gathering finished.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "gatherers": { + "description": "gatherers is a list of active gatherers (and their statuses) in the last gathering.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.GathererStatus" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + }, + "insightsReport": { + "description": "insightsReport provides general Insights analysis results. When omitted, this means no data gathering has taken place yet or the corresponding Insights analysis (identified by \"insightsRequestID\") is not available.", + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.InsightsReport" + }, + "insightsRequestID": { + "description": "insightsRequestID is an Insights request ID to track the status of the Insights analysis (in console.redhat.com processing pipeline) for the corresponding Insights data archive.", + "type": "string" + }, + "relatedObjects": { + "description": "relatedObjects is a list of resources which are useful when debugging or inspecting the data gathering Pod", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.ObjectReference" + } + }, + "startTime": { + "description": "startTime is the time when Insights data gathering started.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "DataGatherStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.GathererConfig": { + "description": "gathererConfig allows to configure specific gatherers", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name is the name of specific gatherer", + "type": "string", + "default": "" + }, + "state": { + "description": "state allows you to configure specific gatherer. Valid values are \"Enabled\", \"Disabled\" and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default. The current default is Enabled.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "GathererConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.GathererStatus": { + "description": "gathererStatus represents information about a particular data gatherer.", + "type": "object", + "required": [ + "conditions", + "name", + "lastGatherDuration" + ], + "properties": { + "conditions": { + "description": "conditions provide details on the status of each gatherer.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "lastGatherDuration": { + "description": "lastGatherDuration represents the time spent gathering.", + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "name": { + "description": "name is the name of the gatherer.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "GathererStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.HealthCheck": { + "description": "healthCheck represents an Insights health check attributes.", + "type": "object", + "required": [ + "description", + "totalRisk", + "advisorURI", + "state" + ], + "properties": { + "advisorURI": { + "description": "advisorURI provides the URL link to the Insights Advisor.", + "type": "string", + "default": "" + }, + "description": { + "description": "description provides basic description of the healtcheck.", + "type": "string", + "default": "" + }, + "state": { + "description": "state determines what the current state of the health check is. Health check is enabled by default and can be disabled by the user in the Insights advisor user interface.", + "type": "string", + "default": "" + }, + "totalRisk": { + "description": "totalRisk of the healthcheck. Indicator of the total risk posed by the detected issue; combination of impact and likelihood. The values can be from 1 to 4, and the higher the number, the more important the issue.", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "HealthCheck", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.InsightsReport": { + "description": "insightsReport provides Insights health check report based on the most recently sent Insights data.", + "type": "object", + "properties": { + "downloadedAt": { + "description": "downloadedAt is the time when the last Insights report was downloaded. An empty value means that there has not been any Insights report downloaded yet and it usually appears in disconnected clusters (or clusters when the Insights data gathering is disabled).", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "healthChecks": { + "description": "healthChecks provides basic information about active Insights health checks in a cluster.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.insights.v1alpha1.HealthCheck" + }, + "x-kubernetes-list-type": "atomic" + }, + "uri": { + "description": "uri provides the URL link from which the report was downloaded.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "InsightsReport", + "Scope": "Namespaced" + } + }, + "io.openshift.insights.v1alpha1.ObjectReference": { + "description": "ObjectReference contains enough information to let you inspect or modify the referred object.", + "type": "object", + "required": [ + "group", + "resource", + "name" + ], + "properties": { + "group": { + "description": "group is the API Group of the Resource. Enter empty string for the core group. This value should consist of only lowercase alphanumeric characters, hyphens and periods. Example: \"\", \"apps\", \"build.openshift.io\", etc.", + "type": "string", + "default": "" + }, + "name": { + "description": "name of the referent.", + "type": "string", + "default": "" + }, + "namespace": { + "description": "namespace of the referent.", + "type": "string" + }, + "resource": { + "description": "resource is the type that is being referenced. It is normally the plural form of the resource kind in lowercase. This value should consist of only lowercase alphanumeric characters and hyphens. Example: \"deployments\", \"deploymentconfigs\", \"pods\", etc.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "insights.openshift.io", + "Version": "v1alpha1", + "Kind": "ObjectReference", + "Scope": "Namespaced" + } + }, + "io.openshift.internal.security.v1.RangeAllocation": { + "description": "RangeAllocation is used so we can easily expose a RangeAllocation typed for security group This is an internal API, not intended for external consumption.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "range", + "data" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "data": { + "description": "data is a byte array representing the serialized state of a range allocation. It is a bitmap with each bit set to one to represent a range is taken.", + "type": "string", + "format": "byte" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "range": { + "description": "range is a string representing a unique label for a range of uids, \"1000000000-2000000000/10000\".", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "security.internal.openshift.io", + "Version": "v1", + "Kind": "RangeAllocation", + "Scope": "Clustered" + } + }, + "io.openshift.internal.security.v1.RangeAllocationList": { + "description": "RangeAllocationList is a list of RangeAllocations objects This is an internal API, not intended for external consumption.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "List of RangeAllocations.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.internal.security.v1.RangeAllocation" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "security.internal.openshift.io", + "Version": "v1", + "Kind": "RangeAllocationList", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AWSFailureDomain": { + "description": "AWSFailureDomain configures failure domain information for the AWS platform.", + "type": "object", + "properties": { + "placement": { + "description": "Placement configures the placement information for this instance.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AWSFailureDomainPlacement" + }, + "subnet": { + "description": "Subnet is a reference to the subnet to use for this instance.", + "$ref": "#/definitions/io.openshift.machine.v1.AWSResourceReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AWSFailureDomain", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AWSFailureDomainPlacement": { + "description": "AWSFailureDomainPlacement configures the placement information for the AWSFailureDomain.", + "type": "object", + "required": [ + "availabilityZone" + ], + "properties": { + "availabilityZone": { + "description": "AvailabilityZone is the availability zone of the instance.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AWSFailureDomainPlacement", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AWSResourceFilter": { + "description": "AWSResourceFilter is a filter used to identify an AWS resource", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "Name of the filter. Filter names are case-sensitive.", + "type": "string", + "default": "" + }, + "values": { + "description": "Values includes one or more filter values. Filter values are case-sensitive.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AWSResourceFilter", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AWSResourceReference": { + "description": "AWSResourceReference is a reference to a specific AWS resource by ID, ARN, or filters. Only one of ID, ARN or Filters may be specified. Specifying more than one will result in a validation error.", + "type": "object", + "required": [ + "type" + ], + "properties": { + "arn": { + "description": "ARN of resource.", + "type": "string" + }, + "filters": { + "description": "Filters is a set of filters used to identify a resource.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AWSResourceFilter" + }, + "x-kubernetes-list-type": "atomic" + }, + "id": { + "description": "ID of resource.", + "type": "string" + }, + "type": { + "description": "Type determines how the reference will fetch the AWS resource.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AWSResourceReference", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "arn": "ARN", + "filters": "Filters", + "id": "ID" + } + } + ] + }, + "io.openshift.machine.v1.AlibabaCloudMachineProviderConfig": { + "description": "AlibabaCloudMachineProviderConfig is the Schema for the alibabacloudmachineproviderconfig API Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "instanceType", + "vpcId", + "regionId", + "zoneId", + "imageId", + "vSwitch", + "resourceGroup" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "bandwidth": { + "description": "Bandwidth describes the internet bandwidth strategy for the instance", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.BandwidthProperties" + }, + "credentialsSecret": { + "description": "CredentialsSecret is a reference to the secret with alibabacloud credentials. Otherwise, defaults to permissions provided by attached RAM role where the actuator is running.", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + }, + "dataDisk": { + "description": "DataDisks holds information regarding the extra disks attached to the instance", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.DataDiskProperties" + } + }, + "imageId": { + "description": "The ID of the image used to create the instance.", + "type": "string", + "default": "" + }, + "instanceType": { + "description": "The instance type of the instance.", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "ramRoleName": { + "description": "RAMRoleName is the name of the instance Resource Access Management (RAM) role. This allows the instance to perform API calls as this specified RAM role.", + "type": "string" + }, + "regionId": { + "description": "The ID of the region in which to create the instance. You can call the DescribeRegions operation to query the most recent region list.", + "type": "string", + "default": "" + }, + "resourceGroup": { + "description": "ResourceGroup references the resource group to which to assign the instance. A reference holds either the resource group ID, the resource name, or the required tags to search. When more than one resource group are returned for a search, an error will be produced and the Machine will not be created. Resource Groups do not support searching by tags.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AlibabaResourceReference" + }, + "securityGroups": { + "description": "SecurityGroups is a list of security group references to assign to the instance. A reference holds either the security group ID, the resource name, or the required tags to search. When more than one security group is returned for a tag search, all the groups are associated with the instance up to the maximum number of security groups to which an instance can belong. For more information, see the \"Security group limits\" section in Limits. https://www.alibabacloud.com/help/en/doc-detail/25412.htm", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AlibabaResourceReference" + } + }, + "systemDisk": { + "description": "SystemDisk holds the properties regarding the system disk for the instance", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.SystemDiskProperties" + }, + "tag": { + "description": "Tags are the set of metadata to add to an instance.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.Tag" + } + }, + "tenancy": { + "description": "Tenancy specifies whether to create the instance on a dedicated host. Valid values:\n\ndefault: creates the instance on a non-dedicated host. host: creates the instance on a dedicated host. If you do not specify the DedicatedHostID parameter, Alibaba Cloud automatically selects a dedicated host for the instance. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `default`.", + "type": "string" + }, + "userDataSecret": { + "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + }, + "vSwitch": { + "description": "VSwitch is a reference to the vswitch to use for this instance. A reference holds either the vSwitch ID, the resource name, or the required tags to search. When more than one vSwitch is returned for a tag search, only the first vSwitch returned will be used. This parameter is required when you create an instance of the VPC type. You can call the DescribeVSwitches operation to query the created vSwitches.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AlibabaResourceReference" + }, + "vpcId": { + "description": "The ID of the vpc", + "type": "string", + "default": "" + }, + "zoneId": { + "description": "The ID of the zone in which to create the instance. You can call the DescribeZones operation to query the most recent region list.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AlibabaCloudMachineProviderConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AlibabaCloudMachineProviderConfigList": { + "description": "AlibabaCloudMachineProviderConfigList contains a list of AlibabaCloudMachineProviderConfig Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AlibabaCloudMachineProviderConfig" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AlibabaCloudMachineProviderConfigList", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AlibabaCloudMachineProviderStatus": { + "description": "AlibabaCloudMachineProviderStatus is the Schema for the alibabacloudmachineproviderconfig API Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "conditions": { + "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + } + }, + "instanceId": { + "description": "InstanceID is the instance ID of the machine created in alibabacloud", + "type": "string" + }, + "instanceState": { + "description": "InstanceState is the state of the alibabacloud instance for this machine", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AlibabaCloudMachineProviderStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AlibabaResourceReference": { + "description": "ResourceTagReference is a reference to a specific AlibabaCloud resource by ID, or tags. Only one of ID or Tags may be specified. Specifying more than one will result in a validation error.", + "type": "object", + "required": [ + "type" + ], + "properties": { + "id": { + "description": "ID of resource", + "type": "string" + }, + "name": { + "description": "Name of the resource", + "type": "string" + }, + "tags": { + "description": "Tags is a set of metadata based upon ECS object tags used to identify a resource. For details about usage when multiple resources are found, please see the owning parent field documentation.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.Tag" + } + }, + "type": { + "description": "type identifies the resource reference type for this entry.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AlibabaResourceReference", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.AzureFailureDomain": { + "description": "AzureFailureDomain configures failure domain information for the Azure platform.", + "type": "object", + "required": [ + "zone" + ], + "properties": { + "subnet": { + "description": "subnet is the name of the network subnet in which the VM will be created. When omitted, the subnet value from the machine providerSpec template will be used.", + "type": "string" + }, + "zone": { + "description": "Availability Zone for the virtual machine. If nil, the virtual machine should be deployed to no zone.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "AzureFailureDomain", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.BandwidthProperties": { + "description": "Bandwidth describes the bandwidth strategy for the network of the instance", + "type": "object", + "properties": { + "internetMaxBandwidthIn": { + "description": "InternetMaxBandwidthIn is the maximum inbound public bandwidth. Unit: Mbit/s. Valid values: When the purchased outbound public bandwidth is less than or equal to 10 Mbit/s, the valid values of this parameter are 1 to 10. Currently the default is `10` when outbound bandwidth is less than or equal to 10 Mbit/s. When the purchased outbound public bandwidth is greater than 10, the valid values are 1 to the InternetMaxBandwidthOut value. Currently the default is the value used for `InternetMaxBandwidthOut` when outbound public bandwidth is greater than 10.", + "type": "integer", + "format": "int64" + }, + "internetMaxBandwidthOut": { + "description": "InternetMaxBandwidthOut is the maximum outbound public bandwidth. Unit: Mbit/s. Valid values: 0 to 100. When a value greater than 0 is used then a public IP address is assigned to the instance. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `0`", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "BandwidthProperties", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.ControlPlaneMachineSet": { + "description": "ControlPlaneMachineSet ensures that a specified number of control plane machine replicas are running at any given time. Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "ControlPlaneMachineSet", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.ControlPlaneMachineSetList": { + "description": "ControlPlaneMachineSetList contains a list of ControlPlaneMachineSet Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSet" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "ControlPlaneMachineSetList", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.ControlPlaneMachineSetSpec": { + "description": "ControlPlaneMachineSet represents the configuration of the ControlPlaneMachineSet.", + "type": "object", + "required": [ + "replicas", + "selector", + "template" + ], + "properties": { + "replicas": { + "description": "Replicas defines how many Control Plane Machines should be created by this ControlPlaneMachineSet. This field is immutable and cannot be changed after cluster installation. The ControlPlaneMachineSet only operates with 3 or 5 node control planes, 3 and 5 are the only valid values for this field.", + "type": "integer", + "format": "int32" + }, + "selector": { + "description": "Label selector for Machines. Existing Machines selected by this selector will be the ones affected by this ControlPlaneMachineSet. It must match the template's labels. This field is considered immutable after creation of the resource.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + }, + "state": { + "description": "State defines whether the ControlPlaneMachineSet is Active or Inactive. When Inactive, the ControlPlaneMachineSet will not take any action on the state of the Machines within the cluster. When Active, the ControlPlaneMachineSet will reconcile the Machines and will update the Machines as necessary. Once Active, a ControlPlaneMachineSet cannot be made Inactive. To prevent further action please remove the ControlPlaneMachineSet.", + "type": "string", + "default": "Inactive" + }, + "strategy": { + "description": "Strategy defines how the ControlPlaneMachineSet will update Machines when it detects a change to the ProviderSpec.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetStrategy" + }, + "template": { + "description": "Template describes the Control Plane Machines that will be created by this ControlPlaneMachineSet.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetTemplate" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "ControlPlaneMachineSetSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.ControlPlaneMachineSetStatus": { + "description": "ControlPlaneMachineSetStatus represents the status of the ControlPlaneMachineSet CRD.", + "type": "object", + "properties": { + "conditions": { + "description": "Conditions represents the observations of the ControlPlaneMachineSet's current state. Known .status.conditions.type are: Available, Degraded and Progressing.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "observedGeneration": { + "description": "ObservedGeneration is the most recent generation observed for this ControlPlaneMachineSet. It corresponds to the ControlPlaneMachineSets's generation, which is updated on mutation by the API Server.", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "ReadyReplicas is the number of Control Plane Machines created by the ControlPlaneMachineSet controller which are ready. Note that this value may be higher than the desired number of replicas while rolling updates are in-progress.", + "type": "integer", + "format": "int32" + }, + "replicas": { + "description": "Replicas is the number of Control Plane Machines created by the ControlPlaneMachineSet controller. Note that during update operations this value may differ from the desired replica count.", + "type": "integer", + "format": "int32" + }, + "unavailableReplicas": { + "description": "UnavailableReplicas is the number of Control Plane Machines that are still required before the ControlPlaneMachineSet reaches the desired available capacity. When this value is non-zero, the number of ReadyReplicas is less than the desired Replicas.", + "type": "integer", + "format": "int32" + }, + "updatedReplicas": { + "description": "UpdatedReplicas is the number of non-terminated Control Plane Machines created by the ControlPlaneMachineSet controller that have the desired provider spec and are ready. This value is set to 0 when a change is detected to the desired spec. When the update strategy is RollingUpdate, this will also coincide with starting the process of updating the Machines. When the update strategy is OnDelete, this value will remain at 0 until a user deletes an existing replica and its replacement has become ready.", + "type": "integer", + "format": "int32" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "ControlPlaneMachineSetStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.ControlPlaneMachineSetStrategy": { + "description": "ControlPlaneMachineSetStrategy defines the strategy for applying updates to the Control Plane Machines managed by the ControlPlaneMachineSet.", + "type": "object", + "properties": { + "type": { + "description": "Type defines the type of update strategy that should be used when updating Machines owned by the ControlPlaneMachineSet. Valid values are \"RollingUpdate\" and \"OnDelete\". The current default value is \"RollingUpdate\".", + "type": "string", + "default": "RollingUpdate" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "ControlPlaneMachineSetStrategy", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.ControlPlaneMachineSetTemplate": { + "description": "ControlPlaneMachineSetTemplate is a template used by the ControlPlaneMachineSet to create the Machines that it will manage in the future.", + "type": "object", + "properties": { + "machineType": { + "description": "MachineType determines the type of Machines that should be managed by the ControlPlaneMachineSet. Currently, the only valid value is machines_v1beta1_machine_openshift_io.", + "type": "string" + }, + "machines_v1beta1_machine_openshift_io": { + "description": "OpenShiftMachineV1Beta1Machine defines the template for creating Machines from the v1beta1.machine.openshift.io API group.", + "$ref": "#/definitions/io.openshift.machine.v1.OpenShiftMachineV1Beta1MachineTemplate" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "ControlPlaneMachineSetTemplate", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "machineType", + "fields-to-discriminateBy": { + "machines_v1beta1_machine_openshift_io": "OpenShiftMachineV1Beta1Machine" + } + } + ] + }, + "io.openshift.machine.v1.ControlPlaneMachineSetTemplateObjectMeta": { + "description": "ControlPlaneMachineSetTemplateObjectMeta is a subset of the metav1.ObjectMeta struct. It allows users to specify labels and annotations that will be copied onto Machines created from this template.", + "type": "object", + "required": [ + "labels" + ], + "properties": { + "annotations": { + "description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, "labels": { "description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels. This field must contain both the 'machine.openshift.io/cluster-api-machine-role' and 'machine.openshift.io/cluster-api-machine-type' labels, both with a value of 'master'. It must also contain a label with the key 'machine.openshift.io/cluster-api-cluster'.", "type": "object", @@ -35093,577 +37423,1990 @@ "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "ControlPlaneMachineSetTemplateObjectMeta", + "Version": "v1", + "Kind": "ControlPlaneMachineSetTemplateObjectMeta", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.DataDiskProperties": { + "description": "DataDisk contains the information regarding the datadisk attached to an instance", + "type": "object", + "properties": { + "Category": { + "description": "Category describes the type of data disk N. Valid values: cloud_efficiency: ultra disk cloud_ssd: standard SSD cloud_essd: ESSD cloud: basic disk Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently for non-I/O optimized instances of retired instance types, the default is `cloud`. Currently for other instances, the default is `cloud_efficiency`.", + "type": "string", + "default": "" + }, + "DiskEncryption": { + "description": "DiskEncryption specifies whether to encrypt data disk N.\n\nEmpty value means the platform chooses a default, which is subject to change over time. Currently the default is `disabled`.", + "type": "string", + "default": "" + }, + "DiskPreservation": { + "description": "DiskPreservation specifies whether to release data disk N along with the instance. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `DeleteWithInstance`", + "type": "string", + "default": "" + }, + "KMSKeyID": { + "description": "KMSKeyID is the ID of the Key Management Service (KMS) key to be used by data disk N. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `\"\"` which is interpreted as do not use KMSKey encryption.", + "type": "string", + "default": "" + }, + "Name": { + "description": "Name is the name of data disk N. If the name is specified the name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).\n\nEmpty value means the platform chooses a default, which is subject to change over time. Currently the default is `\"\"`.", + "type": "string", + "default": "" + }, + "PerformanceLevel": { + "description": "PerformanceLevel is the performance level of the ESSD used as as data disk N. The N value must be the same as that in DataDisk.N.Category when DataDisk.N.Category is set to cloud_essd. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is `PL1`. Valid values:\n\nPL0: A single ESSD can deliver up to 10,000 random read/write IOPS. PL1: A single ESSD can deliver up to 50,000 random read/write IOPS. PL2: A single ESSD can deliver up to 100,000 random read/write IOPS. PL3: A single ESSD can deliver up to 1,000,000 random read/write IOPS. For more information about ESSD performance levels, see ESSDs.", + "type": "string", + "default": "" + }, + "Size": { + "description": "Size of the data disk N. Valid values of N: 1 to 16. Unit: GiB. Valid values:\n\nValid values when DataDisk.N.Category is set to cloud_efficiency: 20 to 32768 Valid values when DataDisk.N.Category is set to cloud_ssd: 20 to 32768 Valid values when DataDisk.N.Category is set to cloud_essd: 20 to 32768 Valid values when DataDisk.N.Category is set to cloud: 5 to 2000 The value of this parameter must be greater than or equal to the size of the snapshot specified by the SnapshotID parameter.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "SnapshotID": { + "description": "SnapshotID is the ID of the snapshot used to create data disk N. Valid values of N: 1 to 16.\n\nWhen the DataDisk.N.SnapshotID parameter is specified, the DataDisk.N.Size parameter is ignored. The data disk is created based on the size of the specified snapshot. Use snapshots created after July 15, 2013. Otherwise, an error is returned and your request is rejected.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "DataDiskProperties", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.FailureDomains": { + "description": "FailureDomain represents the different configurations required to spread Machines across failure domains on different platforms.", + "type": "object", + "required": [ + "platform" + ], + "properties": { + "aws": { + "description": "AWS configures failure domain information for the AWS platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AWSFailureDomain" + }, + "x-kubernetes-list-type": "atomic" + }, + "azure": { + "description": "Azure configures failure domain information for the Azure platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.AzureFailureDomain" + }, + "x-kubernetes-list-type": "atomic" + }, + "gcp": { + "description": "GCP configures failure domain information for the GCP platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.GCPFailureDomain" + }, + "x-kubernetes-list-type": "atomic" + }, + "nutanix": { + "description": "nutanix configures failure domain information for the Nutanix platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixFailureDomainReference" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + }, + "openstack": { + "description": "OpenStack configures failure domain information for the OpenStack platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.OpenStackFailureDomain" + }, + "x-kubernetes-list-type": "atomic" + }, + "platform": { + "description": "Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, VSphere and Nutanix.", + "type": "string", + "default": "" + }, + "vsphere": { + "description": "vsphere configures failure domain information for the VSphere platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.VSphereFailureDomain" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "FailureDomains", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "platform", + "fields-to-discriminateBy": { + "aws": "AWS", + "azure": "Azure", + "gcp": "GCP", + "nutanix": "Nutanix", + "openstack": "OpenStack", + "vsphere": "VSphere" + } + } + ] + }, + "io.openshift.machine.v1.GCPFailureDomain": { + "description": "GCPFailureDomain configures failure domain information for the GCP platform", + "type": "object", + "required": [ + "zone" + ], + "properties": { + "zone": { + "description": "Zone is the zone in which the GCP machine provider will create the VM.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "GCPFailureDomain", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.LoadBalancerReference": { + "description": "LoadBalancerReference is a reference to a load balancer on IBM Cloud virtual private cloud(VPC).", + "type": "object", + "required": [ + "name", + "type" + ], + "properties": { + "name": { + "description": "name of the LoadBalancer in IBM Cloud VPC. The name should be between 1 and 63 characters long and may consist of lowercase alphanumeric characters and hyphens only. The value must not end with a hyphen. It is a reference to existing LoadBalancer created by openshift installer component.", + "type": "string", + "default": "" + }, + "type": { + "description": "type of the LoadBalancer service supported by IBM Cloud VPC. Currently, only Application LoadBalancer is supported. More details about Application LoadBalancer https://cloud.ibm.com/docs/vpc?topic=vpc-load-balancers-about\u0026interface=ui Supported values are Application.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "LoadBalancerReference", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixCategory": { + "description": "NutanixCategory identifies a pair of prism category key and value", + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "description": "key is the prism category key name", + "type": "string", + "default": "" + }, + "value": { + "description": "value is the prism category value associated with the key", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixCategory", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixFailureDomainReference": { + "description": "NutanixFailureDomainReference refers to the failure domain of the Nutanix platform.", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name of the failure domain in which the nutanix machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixFailureDomainReference", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixGPU": { + "description": "NutanixGPU holds the identity of a Nutanix GPU resource in the Prism Central", + "type": "object", + "required": [ + "type" + ], + "properties": { + "deviceID": { + "description": "deviceID is the GPU device ID with the integer value.", + "type": "integer", + "format": "int32" + }, + "name": { + "description": "name is the GPU device name", + "type": "string" + }, + "type": { + "description": "type is the identifier type of the GPU device. Valid values are Name and DeviceID.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixGPU", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "deviceID": "DeviceID", + "name": "Name" + } + } + ] + }, + "io.openshift.machine.v1.NutanixMachineProviderConfig": { + "description": "NutanixMachineProviderConfig is the Schema for the nutanixmachineproviderconfigs API Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "cluster", + "image", + "subnets", + "vcpusPerSocket", + "vcpuSockets", + "memorySize", + "systemDiskSize", + "credentialsSecret" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "bootType": { + "description": "bootType indicates the boot type (Legacy, UEFI or SecureBoot) the Machine's VM uses to boot. If this field is empty or omitted, the VM will use the default boot type \"Legacy\" to boot. \"SecureBoot\" depends on \"UEFI\" boot, i.e., enabling \"SecureBoot\" means that \"UEFI\" boot is also enabled.", + "type": "string", + "default": "" + }, + "categories": { + "description": "categories optionally adds one or more prism categories (each with key and value) for the Machine's VM to associate with. All the category key and value pairs specified must already exist in the prism central.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixCategory" + }, + "x-kubernetes-list-map-keys": [ + "key" + ], + "x-kubernetes-list-type": "map" + }, + "cluster": { + "description": "cluster is to identify the cluster (the Prism Element under management of the Prism Central), in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + }, + "credentialsSecret": { + "description": "credentialsSecret is a local reference to a secret that contains the credentials data to access Nutanix PC client", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + }, + "dataDisks": { + "description": "dataDisks holds information of the data disks to attach to the Machine's VM", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMDisk" + }, + "x-kubernetes-list-type": "set" + }, + "failureDomain": { + "description": "failureDomain refers to the name of the FailureDomain with which this Machine is associated. If this is configured, the Nutanix machine controller will use the prism_central endpoint and credentials defined in the referenced FailureDomain to communicate to the prism_central. It will also verify that the 'cluster' and subnets' configuration in the NutanixMachineProviderConfig is consistent with that in the referenced failureDomain.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixFailureDomainReference" + }, + "gpus": { + "description": "gpus is a list of GPU devices to attach to the machine's VM. The GPU devices should already exist in Prism Central and associated with one of the Prism Element's hosts and available for the VM to attach (in \"UNUSED\" status).", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixGPU" + }, + "x-kubernetes-list-type": "set" + }, + "image": { + "description": "image is to identify the rhcos image uploaded to the Prism Central (PC) The image identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "memorySize": { + "description": "memorySize is the memory size (in Quantity format) of the VM The minimum memorySize is 2Gi bytes", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "project": { + "description": "project optionally identifies a Prism project for the Machine's VM to associate with.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + }, + "subnets": { + "description": "subnets holds a list of identifiers (one or more) of the cluster's network subnets for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + } + }, + "systemDiskSize": { + "description": "systemDiskSize is size (in Quantity format) of the system disk of the VM The minimum systemDiskSize is 20Gi bytes", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + }, + "userDataSecret": { + "description": "userDataSecret is a local reference to a secret that contains the UserData to apply to the VM", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + }, + "vcpuSockets": { + "description": "vcpuSockets is the number of vCPU sockets of the VM", + "type": "integer", + "format": "int32", + "default": 0 + }, + "vcpusPerSocket": { + "description": "vcpusPerSocket is the number of vCPUs per socket of the VM", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixMachineProviderConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixMachineProviderStatus": { + "description": "NutanixMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains nutanix-specific status information. Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "conditions": { + "description": "conditions is a set of conditions associated with the Machine to indicate errors or other status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "vmUUID": { + "description": "vmUUID is the Machine associated VM's UUID The field is missing before the VM is created. Once the VM is created, the field is filled with the VM's UUID and it will not change. The vmUUID is used to find the VM when updating the Machine status, and to delete the VM when the Machine is deleted.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixMachineProviderStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixResourceIdentifier": { + "description": "NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, etc.)", + "type": "object", + "required": [ + "type" + ], + "properties": { + "name": { + "description": "name is the resource name in the PC", + "type": "string" + }, + "type": { + "description": "Type is the identifier type to use for this resource.", + "type": "string", + "default": "" + }, + "uuid": { + "description": "uuid is the UUID of the resource in the PC.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixResourceIdentifier", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "name": "Name", + "uuid": "UUID" + } + } + ] + }, + "io.openshift.machine.v1.NutanixStorageResourceIdentifier": { + "description": "NutanixStorageResourceIdentifier holds the identity of a Nutanix storage resource (storage_container, etc.)", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "type is the identifier type to use for this resource. The valid value is \"uuid\".", + "type": "string", + "default": "" + }, + "uuid": { + "description": "uuid is the UUID of the storage resource in the PC.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixStorageResourceIdentifier", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "uuid": "UUID" + } + } + ] + }, + "io.openshift.machine.v1.NutanixVMDisk": { + "description": "NutanixDataDisk specifies the VM data disk configuration parameters.", + "type": "object", + "required": [ + "diskSize" + ], + "properties": { + "dataSource": { + "description": "dataSource refers to a data source image for the VM disk.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + }, + "deviceProperties": { + "description": "deviceProperties are the properties of the disk device.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMDiskDeviceProperties" + }, + "diskSize": { + "description": "diskSize is size (in Quantity format) of the disk attached to the VM. See https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Format for the Quantity format and example documentation. The minimum diskSize is 1GB.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + }, + "storageConfig": { + "description": "storageConfig are the storage configuration parameters of the VM disks.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMStorageConfig" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixVMDisk", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixVMDiskDeviceProperties": { + "description": "NutanixVMDiskDeviceProperties specifies the disk device properties.", + "type": "object", + "required": [ + "deviceType" + ], + "properties": { + "adapterType": { + "description": "adapterType is the adapter type of the disk address. If the deviceType is \"Disk\", the valid adapterType can be \"SCSI\", \"IDE\", \"PCI\", \"SATA\" or \"SPAPR\". If the deviceType is \"CDRom\", the valid adapterType can be \"IDE\" or \"SATA\".", + "type": "string" + }, + "deviceIndex": { + "description": "deviceIndex is the index of the disk address. The valid values are non-negative integers, with the default value 0. For a Machine VM, the deviceIndex for the disks with the same deviceType.adapterType combination should start from 0 and increase consecutively afterwards. Note that for each Machine VM, the Disk.SCSI.0 and CDRom.IDE.0 are reserved to be used by the VM's system. So for dataDisks of Disk.SCSI and CDRom.IDE, the deviceIndex should start from 1.", + "type": "integer", + "format": "int32" + }, + "deviceType": { + "description": "deviceType specifies the disk device type. The valid values are \"Disk\" and \"CDRom\", and the default is \"Disk\".", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixVMDiskDeviceProperties", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.NutanixVMStorageConfig": { + "description": "NutanixVMStorageConfig specifies the storage configuration parameters for VM disks.", + "type": "object", + "required": [ + "diskMode" + ], + "properties": { + "diskMode": { + "description": "diskMode specifies the disk mode. The valid values are Standard and Flash, and the default is Standard.", + "type": "string", + "default": "" + }, + "storageContainer": { + "description": "storageContainer refers to the storage_container used by the VM disk.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixStorageResourceIdentifier" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "NutanixVMStorageConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.OpenShiftMachineV1Beta1MachineTemplate": { + "description": "OpenShiftMachineV1Beta1MachineTemplate is a template for the ControlPlaneMachineSet to create Machines from the v1beta1.machine.openshift.io API group.", + "type": "object", + "required": [ + "metadata", + "spec" + ], + "properties": { + "failureDomains": { + "description": "FailureDomains is the list of failure domains (sometimes called availability zones) in which the ControlPlaneMachineSet should balance the Control Plane Machines. This will be merged into the ProviderSpec given in the template. This field is optional on platforms that do not require placement information.", + "$ref": "#/definitions/io.openshift.machine.v1.FailureDomains" + }, + "metadata": { + "description": "ObjectMeta is the standard object metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata Labels are required to match the ControlPlaneMachineSet selector.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetTemplateObjectMeta" + }, + "spec": { + "description": "Spec contains the desired configuration of the Control Plane Machines. The ProviderSpec within contains platform specific details for creating the Control Plane Machines. The ProviderSe should be complete apart from the platform specific failure domain field. This will be overriden when the Machines are created based on the FailureDomains field.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSpec" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "OpenShiftMachineV1Beta1MachineTemplate", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.OpenStackFailureDomain": { + "description": "OpenStackFailureDomain configures failure domain information for the OpenStack platform.", + "type": "object", + "properties": { + "availabilityZone": { + "description": "availabilityZone is the nova availability zone in which the OpenStack machine provider will create the VM. If not specified, the VM will be created in the default availability zone specified in the nova configuration. Availability zone names must NOT contain : since it is used by admin users to specify hosts where instances are launched in server creation. Also, it must not contain spaces otherwise it will lead to node that belongs to this availability zone register failure, see kubernetes/cloud-provider-openstack#1379 for further information. The maximum length of availability zone name is 63 as per labels limits.", + "type": "string" + }, + "rootVolume": { + "description": "rootVolume contains settings that will be used by the OpenStack machine provider to create the root volume attached to the VM. If not specified, no root volume will be created.", + "$ref": "#/definitions/io.openshift.machine.v1.RootVolume" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "OpenStackFailureDomain", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.PowerVSMachineProviderConfig": { + "description": "PowerVSMachineProviderConfig is the type that will be embedded in a Machine.Spec.ProviderSpec field for a PowerVS virtual machine. It is used by the PowerVS machine actuator to create a single Machine.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "serviceInstance", + "image", + "network", + "keyPairName" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "credentialsSecret": { + "description": "credentialsSecret is a reference to the secret with IBM Cloud credentials.", + "$ref": "#/definitions/io.openshift.machine.v1.PowerVSSecretReference" + }, + "image": { + "description": "image is to identify the rhcos image uploaded to IBM COS bucket which is used to create the instance. supported image identifier in PowerVSResource are Name and ID and that can be obtained from IBM Cloud UI or IBM Cloud cli.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.PowerVSResource" + }, + "keyPairName": { + "description": "keyPairName is the name of the KeyPair to use for SSH. The key pair will be exposed to the instance via the instance metadata service. On boot, the OS will copy the public keypair into the authorized keys for the core user.", + "type": "string", + "default": "" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "loadBalancers": { + "description": "loadBalancers is the set of load balancers to which the new control plane instance should be added once it is created.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.LoadBalancerReference" + } + }, + "memoryGiB": { + "description": "memoryGiB is the size of a virtual machine's memory, in GiB. maximum value for the MemoryGiB depends on the selected SystemType. when SystemType is set to e880 maximum MemoryGiB value is 7463 GiB. when SystemType is set to e980 maximum MemoryGiB value is 15307 GiB. when SystemType is set to s922 maximum MemoryGiB value is 942 GiB. The minimum memory is 32 GiB. When omitted, this means the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is 32.", + "type": "integer", + "format": "int32" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "network": { + "description": "network is the reference to the Network to use for this instance. supported network identifier in PowerVSResource are Name, ID and RegEx and that can be obtained from IBM Cloud UI or IBM Cloud cli.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.PowerVSResource" + }, + "processorType": { + "description": "processorType is the VM instance processor type. It must be set to one of the following values: Dedicated, Capped or Shared. Dedicated: resources are allocated for a specific client, The hypervisor makes a 1:1 binding of a partition’s processor to a physical processor core. Shared: Shared among other clients. Capped: Shared, but resources do not expand beyond those that are requested, the amount of CPU time is Capped to the value specified for the entitlement. if the processorType is selected as Dedicated, then processors value cannot be fractional. When omitted, this means that the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is Shared.", + "type": "string" + }, + "processors": { + "description": "processors is the number of virtual processors in a virtual machine. when the processorType is selected as Dedicated the processors value cannot be fractional. maximum value for the Processors depends on the selected SystemType. when SystemType is set to e880 or e980 maximum Processors value is 143. when SystemType is set to s922 maximum Processors value is 15. minimum value for Processors depends on the selected ProcessorType. when ProcessorType is set as Shared or Capped, The minimum processors is 0.5. when ProcessorType is set as Dedicated, The minimum processors is 1. When omitted, this means that the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The default is set based on the selected ProcessorType. when ProcessorType selected as Dedicated, the default is set to 1. when ProcessorType selected as Shared or Capped, the default is set to 0.5.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" + }, + "serviceInstance": { + "description": "serviceInstance is the reference to the Power VS service on which the server instance(VM) will be created. Power VS service is a container for all Power VS instances at a specific geographic region. serviceInstance can be created via IBM Cloud catalog or CLI. supported serviceInstance identifier in PowerVSResource are Name and ID and that can be obtained from IBM Cloud UI or IBM Cloud cli. More detail about Power VS service instance. https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.PowerVSResource" + }, + "systemType": { + "description": "systemType is the System type used to host the instance. systemType determines the number of cores and memory that is available. Few of the supported SystemTypes are s922,e880,e980. e880 systemType available only in Dallas Datacenters. e980 systemType available in Datacenters except Dallas and Washington. When omitted, this means that the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is s922 which is generally available.", + "type": "string" + }, + "userDataSecret": { + "description": "userDataSecret contains a local reference to a secret that contains the UserData to apply to the instance.", + "$ref": "#/definitions/io.openshift.machine.v1.PowerVSSecretReference" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "PowerVSMachineProviderConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.PowerVSMachineProviderStatus": { + "description": "PowerVSMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains PowerVS-specific status information.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "conditions": { + "description": "conditions is a set of conditions associated with the Machine to indicate errors or other status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "instanceId": { + "description": "instanceId is the instance ID of the machine created in PowerVS instanceId uniquely identifies a Power VS server instance(VM) under a Power VS service. This will help in updating or deleting a VM in Power VS Cloud", + "type": "string" + }, + "instanceState": { + "description": "instanceState is the state of the PowerVS instance for this machine Possible instance states are Active, Build, ShutOff, Reboot This is used to display additional information to user regarding instance current state", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "serviceInstanceID": { + "description": "serviceInstanceID is the reference to the Power VS ServiceInstance on which the machine instance will be created. serviceInstanceID uniquely identifies the Power VS service By setting serviceInstanceID it will become easy and efficient to fetch a server instance(VM) within Power VS Cloud.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "PowerVSMachineProviderStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.PowerVSResource": { + "description": "PowerVSResource is a reference to a specific PowerVS resource by ID, Name or RegEx Only one of ID, Name or RegEx may be specified. Specifying more than one will result in a validation error.", + "type": "object", + "properties": { + "id": { + "description": "ID of resource", + "type": "string" + }, + "name": { + "description": "Name of resource", + "type": "string" + }, + "regex": { + "description": "Regex to find resource Regex contains the pattern to match to find a resource", + "type": "string" + }, + "type": { + "description": "Type identifies the resource type for this entry. Valid values are ID, Name and RegEx", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "PowerVSResource", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "fields-to-discriminateBy": { + "id": "ID", + "name": "Name", + "regex": "RegEx", + "type": "Type" + } + } + ] + }, + "io.openshift.machine.v1.PowerVSSecretReference": { + "description": "PowerVSSecretReference contains enough information to locate the referenced secret inside the same namespace.", + "type": "object", + "properties": { + "name": { + "description": "Name of the secret.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "PowerVSSecretReference", + "Scope": "Namespaced" + }, + "x-kubernetes-map-type": "atomic" + }, + "io.openshift.machine.v1.RootVolume": { + "description": "RootVolume represents the volume metadata to boot from. The original RootVolume struct is defined in the v1alpha1 but it's not best practice to use it directly here so we define a new one that should stay in sync with the original one.", + "type": "object", + "required": [ + "volumeType" + ], + "properties": { + "availabilityZone": { + "description": "availabilityZone specifies the Cinder availability zone where the root volume will be created. If not specifified, the root volume will be created in the availability zone specified by the volume type in the cinder configuration. If the volume type (configured in the OpenStack cluster) does not specify an availability zone, the root volume will be created in the default availability zone specified in the cinder configuration. See https://docs.openstack.org/cinder/latest/admin/availability-zone-type.html for more details. If the OpenStack cluster is deployed with the cross_az_attach configuration option set to false, the root volume will have to be in the same availability zone as the VM (defined by OpenStackFailureDomain.AvailabilityZone). Availability zone names must NOT contain spaces otherwise it will lead to volume that belongs to this availability zone register failure, see kubernetes/cloud-provider-openstack#1379 for further information. The maximum length of availability zone name is 63 as per labels limits.", + "type": "string" + }, + "volumeType": { + "description": "volumeType specifies the type of the root volume that will be provisioned. The maximum length of a volume type name is 255 characters, as per the OpenStack limit.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "RootVolume", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.SystemDiskProperties": { + "description": "SystemDiskProperties contains the information regarding the system disk including performance, size, name, and category", + "type": "object", + "properties": { + "category": { + "description": "Category is the category of the system disk. Valid values: cloud_essd: ESSD. When the parameter is set to this value, you can use the SystemDisk.PerformanceLevel parameter to specify the performance level of the disk. cloud_efficiency: ultra disk. cloud_ssd: standard SSD. cloud: basic disk. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently for non-I/O optimized instances of retired instance types, the default is `cloud`. Currently for other instances, the default is `cloud_efficiency`.", + "type": "string" + }, + "name": { + "description": "Name is the name of the system disk. If the name is specified the name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-). Empty value means the platform chooses a default, which is subject to change over time. Currently the default is `\"\"`.", + "type": "string" + }, + "performanceLevel": { + "description": "PerformanceLevel is the performance level of the ESSD used as the system disk. Valid values:\n\nPL0: A single ESSD can deliver up to 10,000 random read/write IOPS. PL1: A single ESSD can deliver up to 50,000 random read/write IOPS. PL2: A single ESSD can deliver up to 100,000 random read/write IOPS. PL3: A single ESSD can deliver up to 1,000,000 random read/write IOPS. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is `PL1`. For more information about ESSD performance levels, see ESSDs.", + "type": "string" + }, + "size": { + "description": "Size is the size of the system disk. Unit: GiB. Valid values: 20 to 500. The value must be at least 20 and greater than or equal to the size of the image. Empty value means the platform chooses a default, which is subject to change over time. Currently the default is `40` or the size of the image depending on whichever is greater.", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "SystemDiskProperties", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.Tag": { + "description": "Tag The tags of ECS Instance", + "type": "object", + "required": [ + "Key", + "Value" + ], + "properties": { + "Key": { + "description": "Key is the name of the key pair", + "type": "string", + "default": "" + }, + "Value": { + "description": "Value is the value or data of the key pair", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "Tag", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1.VSphereFailureDomain": { + "description": "VSphereFailureDomain configures failure domain information for the vSphere platform", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name of the failure domain in which the vSphere machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource. When balancing machines across failure domains, the control plane machine set will inject configuration from the Infrastructure resource into the machine providerSpec to allocate the machine to a failure domain.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1", + "Kind": "VSphereFailureDomain", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1alpha1.AdditionalBlockDevice": { + "description": "additionalBlockDevice is a block device to attach to the server.", + "type": "object", + "required": [ + "name", + "sizeGiB", + "storage" + ], + "properties": { + "name": { + "description": "name of the block device in the context of a machine. If the block device is a volume, the Cinder volume will be named as a combination of the machine name and this name. Also, this name will be used for tagging the block device. Information about the block device tag can be obtained from the OpenStack metadata API or the config drive.", + "type": "string", + "default": "" + }, + "sizeGiB": { + "description": "sizeGiB is the size of the block device in gibibytes (GiB).", + "type": "integer", + "format": "int32", + "default": 0 + }, + "storage": { + "description": "storage specifies the storage type of the block device and additional storage options.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.BlockDeviceStorage" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "AdditionalBlockDevice", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1alpha1.AddressPair": { + "type": "object", + "properties": { + "ipAddress": { + "type": "string" + }, + "macAddress": { + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "AddressPair", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1alpha1.BlockDeviceStorage": { + "description": "blockDeviceStorage is the storage type of a block device to create and contains additional storage options.", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "type is the type of block device to create. This can be either \"Volume\" or \"Local\".", + "type": "string", + "default": "" + }, + "volume": { + "description": "volume contains additional storage options for a volume block device.", + "$ref": "#/definitions/io.openshift.machine.v1alpha1.BlockDeviceVolume" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "BlockDeviceStorage", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "volume": "Volume" + } + } + ] + }, + "io.openshift.machine.v1alpha1.BlockDeviceVolume": { + "description": "blockDeviceVolume contains additional storage options for a volume block device.", + "type": "object", + "properties": { + "availabilityZone": { + "description": "availabilityZone is the volume availability zone to create the volume in. If omitted, the availability zone of the server will be used. The availability zone must NOT contain spaces otherwise it will lead to volume that belongs to this availability zone register failure, see kubernetes/cloud-provider-openstack#1379 for further information.", + "type": "string" + }, + "type": { + "description": "type is the Cinder volume type of the volume. If omitted, the default Cinder volume type that is configured in the OpenStack cloud will be used.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "BlockDeviceVolume", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1alpha1.Filter": { + "type": "object", + "properties": { + "adminStateUp": { + "description": "Deprecated: adminStateUp is silently ignored. It has no replacement.", + "type": "boolean" + }, + "description": { + "description": "description filters networks by description.", + "type": "string" + }, + "id": { + "description": "Deprecated: use NetworkParam.uuid instead. Ignored if NetworkParam.uuid is set.", + "type": "string" + }, + "limit": { + "description": "Deprecated: limit is silently ignored. It has no replacement.", + "type": "integer", + "format": "int32" + }, + "marker": { + "description": "Deprecated: marker is silently ignored. It has no replacement.", + "type": "string" + }, + "name": { + "description": "name filters networks by name.", + "type": "string" + }, + "notTags": { + "description": "notTags filters by networks which don't match all specified tags. NOT (t1 AND t2...) Multiple tags are comma separated.", + "type": "string" + }, + "notTagsAny": { + "description": "notTagsAny filters by networks which don't match any specified tags. NOT (t1 OR t2...) Multiple tags are comma separated.", + "type": "string" + }, + "projectId": { + "description": "projectId filters networks by project ID.", + "type": "string" + }, + "shared": { + "description": "Deprecated: shared is silently ignored. It has no replacement.", + "type": "boolean" + }, + "sortDir": { + "description": "Deprecated: sortDir is silently ignored. It has no replacement.", + "type": "string" + }, + "sortKey": { + "description": "Deprecated: sortKey is silently ignored. It has no replacement.", + "type": "string" + }, + "status": { + "description": "Deprecated: status is silently ignored. It has no replacement.", + "type": "string" + }, + "tags": { + "description": "tags filters by networks containing all specified tags. Multiple tags are comma separated.", + "type": "string" + }, + "tagsAny": { + "description": "tagsAny filters by networks containing any specified tags. Multiple tags are comma separated.", + "type": "string" + }, + "tenantId": { + "description": "tenantId filters networks by tenant ID. Deprecated: use projectId instead. tenantId will be ignored if projectId is set.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "Filter", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1alpha1.FixedIPs": { + "type": "object", + "required": [ + "subnetID" + ], + "properties": { + "ipAddress": { + "description": "ipAddress is a specific IP address to use in the given subnet. Port creation will fail if the address is not available. If not specified, an available IP from the given subnet will be selected automatically.", + "type": "string" + }, + "subnetID": { + "description": "subnetID specifies the ID of the subnet where the fixed IP will be allocated.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "FixedIPs", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1alpha1.NetworkParam": { + "type": "object", + "properties": { + "filter": { + "description": "Filters for optional network query", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.Filter" + }, + "fixedIp": { + "description": "A fixed IPv4 address for the NIC.", + "type": "string" + }, + "noAllowedAddressPairs": { + "description": "NoAllowedAddressPairs disables creation of allowed address pairs for the network ports", + "type": "boolean" + }, + "portSecurity": { + "description": "PortSecurity optionally enables or disables security on ports managed by OpenStack", + "type": "boolean" + }, + "portTags": { + "description": "PortTags allows users to specify a list of tags to add to ports created in a given network", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "profile": { + "description": "A dictionary that enables the application running on the specified host to pass and receive virtual network interface (VIF) port-specific information to the plug-in.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "subnets": { + "description": "Subnet within a network to use", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.SubnetParam" + } + }, + "uuid": { + "description": "The UUID of the network. Required if you omit the port attribute.", + "type": "string" + }, + "vnicType": { + "description": "The virtual network interface card (vNIC) type that is bound to the neutron port.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1alpha1", + "Kind": "NetworkParam", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.DataDiskProperties": { - "description": "DataDisk contains the information regarding the datadisk attached to an instance", + "io.openshift.machine.v1alpha1.OpenstackProviderSpec": { + "description": "OpenstackProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an OpenStack Instance. It is used by the Openstack machine actuator to create a single machine instance. Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "cloudsSecret", + "cloudName", + "flavor", + "image" + ], "properties": { - "Category": { - "description": "Category describes the type of data disk N. Valid values: cloud_efficiency: ultra disk cloud_ssd: standard SSD cloud_essd: ESSD cloud: basic disk Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently for non-I/O optimized instances of retired instance types, the default is `cloud`. Currently for other instances, the default is `cloud_efficiency`.", + "additionalBlockDevices": { + "description": "additionalBlockDevices is a list of specifications for additional block devices to attach to the server instance", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.AdditionalBlockDevice" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "availabilityZone": { + "description": "The availability zone from which to launch the server.", + "type": "string" + }, + "cloudName": { + "description": "The name of the cloud to use from the clouds secret", + "type": "string", + "default": "" + }, + "cloudsSecret": { + "description": "The name of the secret containing the openstack credentials", + "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" + }, + "configDrive": { + "description": "Config Drive support", + "type": "boolean" + }, + "flavor": { + "description": "The flavor reference for the flavor for your server instance.", + "type": "string", + "default": "" + }, + "floatingIP": { + "description": "floatingIP specifies a floating IP to be associated with the machine. Note that it is not safe to use this parameter in a MachineSet, as only one Machine may be assigned the same floating IP.\n\nDeprecated: floatingIP will be removed in a future release as it cannot be implemented correctly.", + "type": "string" + }, + "image": { + "description": "The name of the image to use for your server instance. If the RootVolume is specified, this will be ignored and use rootVolume directly.", "type": "string", "default": "" }, - "DiskEncryption": { - "description": "DiskEncryption specifies whether to encrypt data disk N.\n\nEmpty value means the platform chooses a default, which is subject to change over time. Currently the default is `disabled`.", - "type": "string", - "default": "" + "keyName": { + "description": "The ssh key to inject in the instance", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "networks": { + "description": "A networks object. Required parameter when there are multiple networks defined for the tenant. When you do not specify the networks parameter, the server attaches to the only network created for the current tenant.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.NetworkParam" + } + }, + "ports": { + "description": "Create and assign additional ports to instances", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.PortOpts" + } + }, + "primarySubnet": { + "description": "The subnet that a set of machines will get ingress/egress traffic from", + "type": "string" + }, + "rootVolume": { + "description": "The volume metadata to boot from", + "$ref": "#/definitions/io.openshift.machine.v1alpha1.RootVolume" + }, + "securityGroups": { + "description": "The names of the security groups to assign to the instance", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.SecurityGroupParam" + } + }, + "serverGroupID": { + "description": "The server group to assign the machine to.", + "type": "string" }, - "DiskPreservation": { - "description": "DiskPreservation specifies whether to release data disk N along with the instance. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `DeleteWithInstance`", - "type": "string", - "default": "" + "serverGroupName": { + "description": "The server group to assign the machine to. A server group with that name will be created if it does not exist. If both ServerGroupID and ServerGroupName are non-empty, they must refer to the same OpenStack resource.", + "type": "string" }, - "KMSKeyID": { - "description": "KMSKeyID is the ID of the Key Management Service (KMS) key to be used by data disk N. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `\"\"` which is interpreted as do not use KMSKey encryption.", - "type": "string", - "default": "" + "serverMetadata": { + "description": "Metadata mapping. Allows you to create a map of key value pairs to add to the server instance.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } }, - "Name": { - "description": "Name is the name of data disk N. If the name is specified the name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).\n\nEmpty value means the platform chooses a default, which is subject to change over time. Currently the default is `\"\"`.", - "type": "string", - "default": "" + "sshUserName": { + "description": "The machine ssh username", + "type": "string" }, - "PerformanceLevel": { - "description": "PerformanceLevel is the performance level of the ESSD used as as data disk N. The N value must be the same as that in DataDisk.N.Category when DataDisk.N.Category is set to cloud_essd. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is `PL1`. Valid values:\n\nPL0: A single ESSD can deliver up to 10,000 random read/write IOPS. PL1: A single ESSD can deliver up to 50,000 random read/write IOPS. PL2: A single ESSD can deliver up to 100,000 random read/write IOPS. PL3: A single ESSD can deliver up to 1,000,000 random read/write IOPS. For more information about ESSD performance levels, see ESSDs.", - "type": "string", - "default": "" + "tags": { + "description": "Machine tags Requires Nova api 2.52 minimum!", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "Size": { - "description": "Size of the data disk N. Valid values of N: 1 to 16. Unit: GiB. Valid values:\n\nValid values when DataDisk.N.Category is set to cloud_efficiency: 20 to 32768 Valid values when DataDisk.N.Category is set to cloud_ssd: 20 to 32768 Valid values when DataDisk.N.Category is set to cloud_essd: 20 to 32768 Valid values when DataDisk.N.Category is set to cloud: 5 to 2000 The value of this parameter must be greater than or equal to the size of the snapshot specified by the SnapshotID parameter.", - "type": "integer", - "format": "int64", - "default": 0 + "trunk": { + "description": "Whether the server instance is created on a trunk port or not.", + "type": "boolean" }, - "SnapshotID": { - "description": "SnapshotID is the ID of the snapshot used to create data disk N. Valid values of N: 1 to 16.\n\nWhen the DataDisk.N.SnapshotID parameter is specified, the DataDisk.N.Size parameter is ignored. The data disk is created based on the size of the specified snapshot. Use snapshots created after July 15, 2013. Otherwise, an error is returned and your request is rejected.", - "type": "string", - "default": "" + "userDataSecret": { + "description": "The name of the secret containing the user data (startup script in most cases)", + "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "DataDiskProperties", + "Version": "v1alpha1", + "Kind": "OpenstackProviderSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.FailureDomains": { - "description": "FailureDomain represents the different configurations required to spread Machines across failure domains on different platforms.", + "io.openshift.machine.v1alpha1.PortOpts": { "type": "object", "required": [ - "platform" + "networkID" ], "properties": { - "aws": { - "description": "AWS configures failure domain information for the AWS platform.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AWSFailureDomain" - }, - "x-kubernetes-list-type": "atomic" + "adminStateUp": { + "description": "adminStateUp sets the administrative state of the created port to up (true), or down (false).", + "type": "boolean" }, - "azure": { - "description": "Azure configures failure domain information for the Azure platform.", + "allowedAddressPairs": { + "description": "allowedAddressPairs specifies a set of allowed address pairs to add to the port.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.AzureFailureDomain" - }, - "x-kubernetes-list-type": "atomic" + "$ref": "#/definitions/io.openshift.machine.v1alpha1.AddressPair" + } }, - "gcp": { - "description": "GCP configures failure domain information for the GCP platform.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.GCPFailureDomain" - }, - "x-kubernetes-list-type": "atomic" + "description": { + "description": "description specifies the description of the created port.", + "type": "string" }, - "nutanix": { - "description": "nutanix configures failure domain information for the Nutanix platform.", + "fixedIPs": { + "description": "fixedIPs specifies a set of fixed IPs to assign to the port. They must all be valid for the port's network.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixFailureDomainReference" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "$ref": "#/definitions/io.openshift.machine.v1alpha1.FixedIPs" + } }, - "openstack": { - "description": "OpenStack configures failure domain information for the OpenStack platform.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.OpenStackFailureDomain" - }, - "x-kubernetes-list-type": "atomic" + "hostID": { + "description": "The ID of the host where the port is allocated. Do not use this field: it cannot be used correctly. Deprecated: hostID is silently ignored. It will be removed with no replacement.", + "type": "string" }, - "platform": { - "description": "Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, VSphere and Nutanix.", + "macAddress": { + "description": "macAddress specifies the MAC address of the created port.", + "type": "string" + }, + "nameSuffix": { + "description": "If nameSuffix is specified the created port will be named \u003cmachine name\u003e-\u003cnameSuffix\u003e. If not specified the port will be named \u003cmachine-name\u003e-\u003cindex of this port\u003e.", + "type": "string" + }, + "networkID": { + "description": "networkID is the ID of the network the port will be created in. It is required.", "type": "string", "default": "" }, - "vsphere": { - "description": "vsphere configures failure domain information for the VSphere platform.", + "portSecurity": { + "description": "enable or disable security on a given port incompatible with securityGroups and allowedAddressPairs", + "type": "boolean" + }, + "profile": { + "description": "A dictionary that enables the application running on the specified host to pass and receive virtual network interface (VIF) port-specific information to the plug-in.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "projectID": { + "description": "projectID specifies the project ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended.", + "type": "string" + }, + "securityGroups": { + "description": "securityGroups specifies a set of security group UUIDs to use instead of the machine's default security groups. The default security groups will be used if this is left empty or not specified.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.VSphereFailureDomain" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "type": "string", + "default": "" + } + }, + "tags": { + "description": "tags species a set of tags to add to the port.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "tenantID": { + "description": "tenantID specifies the tenant ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended. Deprecated: use projectID instead. It will be ignored if projectID is set.", + "type": "string" + }, + "trunk": { + "description": "Enables and disables trunk at port level. If not provided, openStackMachine.Spec.Trunk is inherited.", + "type": "boolean" + }, + "vnicType": { + "description": "The virtual network interface card (vNIC) type that is bound to the neutron port.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "FailureDomains", + "Version": "v1alpha1", + "Kind": "PortOpts", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "platform", - "fields-to-discriminateBy": { - "aws": "AWS", - "azure": "Azure", - "gcp": "GCP", - "nutanix": "Nutanix", - "openstack": "OpenStack", - "vsphere": "VSphere" - } - } - ] + } }, - "io.openshift.machine.v1.GCPFailureDomain": { - "description": "GCPFailureDomain configures failure domain information for the GCP platform", + "io.openshift.machine.v1alpha1.RootVolume": { "type": "object", - "required": [ - "zone" - ], "properties": { - "zone": { - "description": "Zone is the zone in which the GCP machine provider will create the VM.", - "type": "string", - "default": "" + "availabilityZone": { + "description": "availabilityZone specifies the Cinder availability where the root volume will be created.", + "type": "string" + }, + "deviceType": { + "description": "Deprecated: deviceType will be silently ignored. There is no replacement.", + "type": "string" + }, + "diskSize": { + "description": "diskSize specifies the size, in GB, of the created root volume.", + "type": "integer", + "format": "int32" + }, + "sourceType": { + "description": "Deprecated: sourceType will be silently ignored. There is no replacement.", + "type": "string" + }, + "sourceUUID": { + "description": "sourceUUID specifies the UUID of a glance image used to populate the root volume. Deprecated: set image in the platform spec instead. This will be ignored if image is set in the platform spec.", + "type": "string" + }, + "volumeType": { + "description": "volumeType specifies a volume type to use when creating the root volume. If not specified the default volume type will be used.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "GCPFailureDomain", + "Version": "v1alpha1", + "Kind": "RootVolume", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.LoadBalancerReference": { - "description": "LoadBalancerReference is a reference to a load balancer on IBM Cloud virtual private cloud(VPC).", + "io.openshift.machine.v1alpha1.SecurityGroupFilter": { "type": "object", - "required": [ - "name", - "type" - ], "properties": { + "description": { + "description": "description filters security groups by description.", + "type": "string" + }, + "id": { + "description": "id specifies the ID of a security group to use. If set, id will not be validated before use. An invalid id will result in failure to create a server with an appropriate error message.", + "type": "string" + }, + "limit": { + "description": "Deprecated: limit is silently ignored. It has no replacement.", + "type": "integer", + "format": "int32" + }, + "marker": { + "description": "Deprecated: marker is silently ignored. It has no replacement.", + "type": "string" + }, "name": { - "description": "name of the LoadBalancer in IBM Cloud VPC. The name should be between 1 and 63 characters long and may consist of lowercase alphanumeric characters and hyphens only. The value must not end with a hyphen. It is a reference to existing LoadBalancer created by openshift installer component.", - "type": "string", - "default": "" + "description": "name filters security groups by name.", + "type": "string" }, - "type": { - "description": "type of the LoadBalancer service supported by IBM Cloud VPC. Currently, only Application LoadBalancer is supported. More details about Application LoadBalancer https://cloud.ibm.com/docs/vpc?topic=vpc-load-balancers-about\u0026interface=ui Supported values are Application.", - "type": "string", - "default": "" + "notTags": { + "description": "notTags filters by security groups which don't match all specified tags. NOT (t1 AND t2...) Multiple tags are comma separated.", + "type": "string" + }, + "notTagsAny": { + "description": "notTagsAny filters by security groups which don't match any specified tags. NOT (t1 OR t2...) Multiple tags are comma separated.", + "type": "string" + }, + "projectId": { + "description": "projectId filters security groups by project ID.", + "type": "string" + }, + "sortDir": { + "description": "Deprecated: sortDir is silently ignored. It has no replacement.", + "type": "string" + }, + "sortKey": { + "description": "Deprecated: sortKey is silently ignored. It has no replacement.", + "type": "string" + }, + "tags": { + "description": "tags filters by security groups containing all specified tags. Multiple tags are comma separated.", + "type": "string" + }, + "tagsAny": { + "description": "tagsAny filters by security groups containing any specified tags. Multiple tags are comma separated.", + "type": "string" + }, + "tenantId": { + "description": "tenantId filters security groups by tenant ID. Deprecated: use projectId instead. tenantId will be ignored if projectId is set.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "LoadBalancerReference", + "Version": "v1alpha1", + "Kind": "SecurityGroupFilter", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixCategory": { - "description": "NutanixCategory identifies a pair of prism category key and value", + "io.openshift.machine.v1alpha1.SecurityGroupParam": { "type": "object", - "required": [ - "key", - "value" - ], "properties": { - "key": { - "description": "key is the prism category key name", - "type": "string", - "default": "" + "filter": { + "description": "Filters used to query security groups in openstack", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.SecurityGroupFilter" }, - "value": { - "description": "value is the prism category value associated with the key", - "type": "string", - "default": "" + "name": { + "description": "Security Group name", + "type": "string" + }, + "uuid": { + "description": "Security Group UUID", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixCategory", + "Version": "v1alpha1", + "Kind": "SecurityGroupParam", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixFailureDomainReference": { - "description": "NutanixFailureDomainReference refers to the failure domain of the Nutanix platform.", + "io.openshift.machine.v1alpha1.SubnetFilter": { "type": "object", - "required": [ - "name" - ], "properties": { + "cidr": { + "description": "cidr filters subnets by CIDR.", + "type": "string" + }, + "description": { + "description": "description filters subnets by description.", + "type": "string" + }, + "enableDhcp": { + "description": "Deprecated: enableDhcp is silently ignored. It has no replacement.", + "type": "boolean" + }, + "gateway_ip": { + "description": "gateway_ip filters subnets by gateway IP.", + "type": "string" + }, + "id": { + "description": "id is the uuid of a specific subnet to use. If specified, id will not be validated. Instead server creation will fail with an appropriate error.", + "type": "string" + }, + "ipVersion": { + "description": "ipVersion filters subnets by IP version.", + "type": "integer", + "format": "int32" + }, + "ipv6AddressMode": { + "description": "ipv6AddressMode filters subnets by IPv6 address mode.", + "type": "string" + }, + "ipv6RaMode": { + "description": "ipv6RaMode filters subnets by IPv6 router adversiement mode.", + "type": "string" + }, + "limit": { + "description": "Deprecated: limit is silently ignored. It has no replacement.", + "type": "integer", + "format": "int32" + }, + "marker": { + "description": "Deprecated: marker is silently ignored. It has no replacement.", + "type": "string" + }, "name": { - "description": "name of the failure domain in which the nutanix machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource.", - "type": "string", - "default": "" + "description": "name filters subnets by name.", + "type": "string" + }, + "networkId": { + "description": "Deprecated: networkId is silently ignored. Set uuid on the containing network definition instead.", + "type": "string" + }, + "notTags": { + "description": "notTags filters by subnets which don't match all specified tags. NOT (t1 AND t2...) Multiple tags are comma separated.", + "type": "string" + }, + "notTagsAny": { + "description": "notTagsAny filters by subnets which don't match any specified tags. NOT (t1 OR t2...) Multiple tags are comma separated.", + "type": "string" + }, + "projectId": { + "description": "projectId filters subnets by project ID.", + "type": "string" + }, + "sortDir": { + "description": "Deprecated: sortDir is silently ignored. It has no replacement.", + "type": "string" + }, + "sortKey": { + "description": "Deprecated: sortKey is silently ignored. It has no replacement.", + "type": "string" + }, + "subnetpoolId": { + "description": "subnetpoolId filters subnets by subnet pool ID.", + "type": "string" + }, + "tags": { + "description": "tags filters by subnets containing all specified tags. Multiple tags are comma separated.", + "type": "string" + }, + "tagsAny": { + "description": "tagsAny filters by subnets containing any specified tags. Multiple tags are comma separated.", + "type": "string" + }, + "tenantId": { + "description": "tenantId filters subnets by tenant ID. Deprecated: use projectId instead. tenantId will be ignored if projectId is set.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixFailureDomainReference", + "Version": "v1alpha1", + "Kind": "SubnetFilter", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixGPU": { - "description": "NutanixGPU holds the identity of a Nutanix GPU resource in the Prism Central", + "io.openshift.machine.v1alpha1.SubnetParam": { "type": "object", - "required": [ - "type" - ], "properties": { - "deviceID": { - "description": "deviceID is the GPU device ID with the integer value.", - "type": "integer", - "format": "int32" + "filter": { + "description": "Filters for optional network query", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1alpha1.SubnetFilter" }, - "name": { - "description": "name is the GPU device name", - "type": "string" + "portSecurity": { + "description": "PortSecurity optionally enables or disables security on ports managed by OpenStack", + "type": "boolean" }, - "type": { - "description": "type is the identifier type of the GPU device. Valid values are Name and DeviceID.", - "type": "string", - "default": "" + "portTags": { + "description": "PortTags are tags that are added to ports created on this subnet", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "uuid": { + "description": "The UUID of the network. Required if you omit the port attribute.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixGPU", + "Version": "v1alpha1", + "Kind": "SubnetParam", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "deviceID": "DeviceID", - "name": "Name" - } - } - ] + } }, - "io.openshift.machine.v1.NutanixMachineProviderConfig": { - "description": "NutanixMachineProviderConfig is the Schema for the nutanixmachineproviderconfigs API Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.AWSMachineProviderConfig": { + "description": "AWSMachineProviderConfig is the Schema for the awsmachineproviderconfigs API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "cluster", - "image", - "subnets", - "vcpusPerSocket", - "vcpuSockets", - "memorySize", - "systemDiskSize", - "credentialsSecret" + "ami", + "instanceType", + "deviceIndex", + "subnet", + "placement" ], "properties": { + "ami": { + "description": "AMI is the reference to the AMI from which to create the machine instance.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "bootType": { - "description": "bootType indicates the boot type (Legacy, UEFI or SecureBoot) the Machine's VM uses to boot. If this field is empty or omitted, the VM will use the default boot type \"Legacy\" to boot. \"SecureBoot\" depends on \"UEFI\" boot, i.e., enabling \"SecureBoot\" means that \"UEFI\" boot is also enabled.", - "type": "string", - "default": "" - }, - "categories": { - "description": "categories optionally adds one or more prism categories (each with key and value) for the Machine's VM to associate with. All the category key and value pairs specified must already exist in the prism central.", + "blockDevices": { + "description": "BlockDevices is the set of block device mapping associated to this instance, block device without a name will be used as a root device and only one device without a name is allowed https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixCategory" - }, - "x-kubernetes-list-map-keys": [ - "key" - ], - "x-kubernetes-list-type": "map" + "$ref": "#/definitions/io.openshift.machine.v1beta1.BlockDeviceMappingSpec" + } }, - "cluster": { - "description": "cluster is to identify the cluster (the Prism Element under management of the Prism Central), in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + "capacityReservationId": { + "description": "capacityReservationId specifies the target Capacity Reservation into which the instance should be launched. The field size should be greater than 0 and the field input must start with cr-***", + "type": "string", + "default": "" }, "credentialsSecret": { - "description": "credentialsSecret is a local reference to a secret that contains the credentials data to access Nutanix PC client", + "description": "CredentialsSecret is a reference to the secret with AWS credentials. Otherwise, defaults to permissions provided by attached IAM role where the actuator is running.", "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" }, - "dataDisks": { - "description": "dataDisks holds information of the data disks to attach to the Machine's VM", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMDisk" - }, - "x-kubernetes-list-type": "set" + "deviceIndex": { + "description": "DeviceIndex is the index of the device on the instance for the network interface attachment. Defaults to 0.", + "type": "integer", + "format": "int64", + "default": 0 }, - "failureDomain": { - "description": "failureDomain refers to the name of the FailureDomain with which this Machine is associated. If this is configured, the Nutanix machine controller will use the prism_central endpoint and credentials defined in the referenced FailureDomain to communicate to the prism_central. It will also verify that the 'cluster' and subnets' configuration in the NutanixMachineProviderConfig is consistent with that in the referenced failureDomain.", - "$ref": "#/definitions/io.openshift.machine.v1.NutanixFailureDomainReference" + "iamInstanceProfile": { + "description": "IAMInstanceProfile is a reference to an IAM role to assign to the instance", + "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" }, - "gpus": { - "description": "gpus is a list of GPU devices to attach to the machine's VM. The GPU devices should already exist in Prism Central and associated with one of the Prism Element's hosts and available for the VM to attach (in \"UNUSED\" status).", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixGPU" - }, - "x-kubernetes-list-type": "set" + "instanceType": { + "description": "InstanceType is the type of instance to create. Example: m4.xlarge", + "type": "string", + "default": "" }, - "image": { - "description": "image is to identify the rhcos image uploaded to the Prism Central (PC) The image identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + "keyName": { + "description": "KeyName is the name of the KeyPair to use for SSH", + "type": "string" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "memorySize": { - "description": "memorySize is the memory size (in Quantity format) of the VM The minimum memorySize is 2Gi bytes", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + "loadBalancers": { + "description": "LoadBalancers is the set of load balancers to which the new instance should be added once it is created.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.LoadBalancerReference" + } }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "project": { - "description": "project optionally identifies a Prism project for the Machine's VM to associate with.", + "metadataServiceOptions": { + "description": "MetadataServiceOptions allows users to configure instance metadata service interaction options. If nothing specified, default AWS IMDS settings will be applied. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceMetadataOptionsRequest.html", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + "$ref": "#/definitions/io.openshift.machine.v1beta1.MetadataServiceOptions" }, - "subnets": { - "description": "subnets holds a list of identifiers (one or more) of the cluster's network subnets for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be obtained from the Prism Central console or using the prism_central API.", + "networkInterfaceType": { + "description": "NetworkInterfaceType specifies the type of network interface to be used for the primary network interface. Valid values are \"ENA\", \"EFA\", and omitted, which means no opinion and the platform chooses a good default which may change over time. The current default value is \"ENA\". Please visit https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html to learn more about the AWS Elastic Fabric Adapter interface option.", + "type": "string" + }, + "placement": { + "description": "Placement specifies where to create the instance in AWS", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.Placement" + }, + "placementGroupName": { + "description": "PlacementGroupName specifies the name of the placement group in which to launch the instance. The placement group must already be created and may use any placement strategy. When omitted, no placement group is used when creating the EC2 instance.", + "type": "string" + }, + "placementGroupPartition": { + "description": "placementGroupPartition is the partition number within the placement group in which to launch the instance. This must be an integer value between 1 and 7. It is only valid if the placement group, referred in `PlacementGroupName` was created with strategy set to partition.", + "type": "integer", + "format": "int32" + }, + "publicIp": { + "description": "PublicIP specifies whether the instance should get a public IP. If not present, it should use the default of its subnet.", + "type": "boolean" + }, + "securityGroups": { + "description": "SecurityGroups is an array of references to security groups that should be applied to the instance.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" } }, - "systemDiskSize": { - "description": "systemDiskSize is size (in Quantity format) of the system disk of the VM The minimum systemDiskSize is 20Gi bytes", + "spotMarketOptions": { + "description": "SpotMarketOptions allows users to configure instances to be run using AWS Spot instances.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.SpotMarketOptions" + }, + "subnet": { + "description": "Subnet is a reference to the subnet to use for this instance", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" + }, + "tags": { + "description": "Tags is the set of tags to add to apply to an instance, in addition to the ones added by default by the actuator. These tags are additive. The actuator will ensure these tags are present, but will not remove any other tags that may exist on the instance.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.TagSpecification" + } }, "userDataSecret": { - "description": "userDataSecret is a local reference to a secret that contains the UserData to apply to the VM", + "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" - }, - "vcpuSockets": { - "description": "vcpuSockets is the number of vCPU sockets of the VM", - "type": "integer", - "format": "int32", - "default": 0 - }, - "vcpusPerSocket": { - "description": "vcpusPerSocket is the number of vCPUs per socket of the VM", - "type": "integer", - "format": "int32", - "default": 0 } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixMachineProviderConfig", + "Version": "v1beta1", + "Kind": "AWSMachineProviderConfig", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixMachineProviderStatus": { - "description": "NutanixMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains nutanix-specific status information. Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.AWSMachineProviderConfigList": { + "description": "AWSMachineProviderConfigList contains a list of AWSMachineProviderConfig Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "items" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "conditions": { - "description": "conditions is a set of conditions associated with the Machine to indicate errors or other status", + "items": { "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSMachineProviderConfig" } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "vmUUID": { - "description": "vmUUID is the Machine associated VM's UUID The field is missing before the VM is created. Once the VM is created, the field is filled with the VM's UUID and it will not change. The vmUUID is used to find the VM when updating the Machine status, and to delete the VM when the Machine is deleted.", - "type": "string" + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", + "Type": "list", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixMachineProviderStatus", + "Version": "v1beta1", + "Kind": "AWSMachineProviderConfigList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixResourceIdentifier": { - "description": "NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, etc.)", + "io.openshift.machine.v1beta1.AWSMachineProviderStatus": { + "description": "AWSMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains AWS-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "type" - ], "properties": { - "name": { - "description": "name is the resource name in the PC", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "type": { - "description": "Type is the identifier type to use for this resource.", - "type": "string", - "default": "" + "conditions": { + "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + } }, - "uuid": { - "description": "uuid is the UUID of the resource in the PC.", + "instanceId": { + "description": "InstanceID is the instance ID of the machine created in AWS", "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixResourceIdentifier", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "name": "Name", - "uuid": "UUID" - } - } - ] - }, - "io.openshift.machine.v1.NutanixStorageResourceIdentifier": { - "description": "NutanixStorageResourceIdentifier holds the identity of a Nutanix storage resource (storage_container, etc.)", - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "description": "type is the identifier type to use for this resource. The valid value is \"uuid\".", - "type": "string", - "default": "" }, - "uuid": { - "description": "uuid is the UUID of the storage resource in the PC.", + "instanceState": { + "description": "InstanceState is the state of the AWS instance for this machine", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixStorageResourceIdentifier", + "Version": "v1beta1", + "Kind": "AWSMachineProviderStatus", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "uuid": "UUID" - } - } - ] + } }, - "io.openshift.machine.v1.NutanixVMDisk": { - "description": "NutanixDataDisk specifies the VM data disk configuration parameters.", + "io.openshift.machine.v1beta1.AWSResourceReference": { + "description": "AWSResourceReference is a reference to a specific AWS resource by ID, ARN, or filters. Only one of ID, ARN or Filters may be specified. Specifying more than one will result in a validation error.", "type": "object", - "required": [ - "diskSize" - ], "properties": { - "dataSource": { - "description": "dataSource refers to a data source image for the VM disk.", - "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" - }, - "deviceProperties": { - "description": "deviceProperties are the properties of the disk device.", - "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMDiskDeviceProperties" + "arn": { + "description": "ARN of resource", + "type": "string" }, - "diskSize": { - "description": "diskSize is size (in Quantity format) of the disk attached to the VM. See https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Format for the Quantity format and example documentation. The minimum diskSize is 1GB.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + "filters": { + "description": "Filters is a set of filters used to identify a resource", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.Filter" + } }, - "storageConfig": { - "description": "storageConfig are the storage configuration parameters of the VM disks.", - "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMStorageConfig" + "id": { + "description": "ID of resource", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixVMDisk", + "Version": "v1beta1", + "Kind": "AWSResourceReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixVMDiskDeviceProperties": { - "description": "NutanixVMDiskDeviceProperties specifies the disk device properties.", + "io.openshift.machine.v1beta1.AddressesFromPool": { + "description": "AddressesFromPool is an IPAddressPool that will be used to create IPAddressClaims for fulfillment by an external controller.", "type": "object", "required": [ - "deviceType" + "group", + "resource", + "name" ], "properties": { - "adapterType": { - "description": "adapterType is the adapter type of the disk address. If the deviceType is \"Disk\", the valid adapterType can be \"SCSI\", \"IDE\", \"PCI\", \"SATA\" or \"SPAPR\". If the deviceType is \"CDRom\", the valid adapterType can be \"IDE\" or \"SATA\".", - "type": "string" + "group": { + "description": "group of the IP address pool type known to an external IPAM controller. This should be a fully qualified domain name, for example, externalipam.controller.io.", + "type": "string", + "default": "" }, - "deviceIndex": { - "description": "deviceIndex is the index of the disk address. The valid values are non-negative integers, with the default value 0. For a Machine VM, the deviceIndex for the disks with the same deviceType.adapterType combination should start from 0 and increase consecutively afterwards. Note that for each Machine VM, the Disk.SCSI.0 and CDRom.IDE.0 are reserved to be used by the VM's system. So for dataDisks of Disk.SCSI and CDRom.IDE, the deviceIndex should start from 1.", - "type": "integer", - "format": "int32" + "name": { + "description": "name of an IP address pool, for example, pool-config-1.", + "type": "string", + "default": "" }, - "deviceType": { - "description": "deviceType specifies the disk device type. The valid values are \"Disk\" and \"CDRom\", and the default is \"Disk\".", + "resource": { + "description": "resource of the IP address pool type known to an external IPAM controller. It is normally the plural form of the resource kind in lowercase, for example, ippools.", "type": "string", "default": "" } @@ -35671,175 +39414,245 @@ "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixVMDiskDeviceProperties", + "Version": "v1beta1", + "Kind": "AddressesFromPool", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.NutanixVMStorageConfig": { - "description": "NutanixVMStorageConfig specifies the storage configuration parameters for VM disks.", + "io.openshift.machine.v1beta1.AzureBootDiagnostics": { + "description": "AzureBootDiagnostics configures the boot diagnostics settings for the virtual machine. This allows you to configure capturing serial output from the virtual machine on boot. This is useful for debugging software based launch issues.", "type": "object", "required": [ - "diskMode" + "storageAccountType" ], "properties": { - "diskMode": { - "description": "diskMode specifies the disk mode. The valid values are Standard and Flash, and the default is Standard.", + "customerManaged": { + "description": "CustomerManaged provides reference to the customer manager storage account.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.AzureCustomerManagedBootDiagnostics" + }, + "storageAccountType": { + "description": "StorageAccountType determines if the storage account for storing the diagnostics data should be provisioned by Azure (AzureManaged) or by the customer (CustomerManaged).", "type": "string", "default": "" - }, - "storageContainer": { - "description": "storageContainer refers to the storage_container used by the VM disk.", - "$ref": "#/definitions/io.openshift.machine.v1.NutanixStorageResourceIdentifier" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "NutanixVMStorageConfig", + "Version": "v1beta1", + "Kind": "AzureBootDiagnostics", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "storageAccountType", + "fields-to-discriminateBy": { + "customerManaged": "CustomerManaged" + } + } + ] }, - "io.openshift.machine.v1.OpenShiftMachineV1Beta1MachineTemplate": { - "description": "OpenShiftMachineV1Beta1MachineTemplate is a template for the ControlPlaneMachineSet to create Machines from the v1beta1.machine.openshift.io API group.", + "io.openshift.machine.v1beta1.AzureCustomerManagedBootDiagnostics": { + "description": "AzureCustomerManagedBootDiagnostics provides reference to a customer managed storage account.", "type": "object", "required": [ - "metadata", - "spec" + "storageAccountURI" ], "properties": { - "failureDomains": { - "description": "FailureDomains is the list of failure domains (sometimes called availability zones) in which the ControlPlaneMachineSet should balance the Control Plane Machines. This will be merged into the ProviderSpec given in the template. This field is optional on platforms that do not require placement information.", - "$ref": "#/definitions/io.openshift.machine.v1.FailureDomains" - }, - "metadata": { - "description": "ObjectMeta is the standard object metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata Labels are required to match the ControlPlaneMachineSet selector.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.ControlPlaneMachineSetTemplateObjectMeta" - }, - "spec": { - "description": "Spec contains the desired configuration of the Control Plane Machines. The ProviderSpec within contains platform specific details for creating the Control Plane Machines. The ProviderSe should be complete apart from the platform specific failure domain field. This will be overriden when the Machines are created based on the FailureDomains field.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSpec" + "storageAccountURI": { + "description": "StorageAccountURI is the URI of the customer managed storage account. The URI typically will be `https://\u003cmystorageaccountname\u003e.blob.core.windows.net/` but may differ if you are using Azure DNS zone endpoints. You can find the correct endpoint by looking for the Blob Primary Endpoint in the endpoints tab in the Azure console.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "OpenShiftMachineV1Beta1MachineTemplate", + "Version": "v1beta1", + "Kind": "AzureCustomerManagedBootDiagnostics", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.OpenStackFailureDomain": { - "description": "OpenStackFailureDomain configures failure domain information for the OpenStack platform.", + "io.openshift.machine.v1beta1.AzureDiagnostics": { + "description": "AzureDiagnostics is used to configure the diagnostic settings of the virtual machine.", "type": "object", "properties": { - "availabilityZone": { - "description": "availabilityZone is the nova availability zone in which the OpenStack machine provider will create the VM. If not specified, the VM will be created in the default availability zone specified in the nova configuration. Availability zone names must NOT contain : since it is used by admin users to specify hosts where instances are launched in server creation. Also, it must not contain spaces otherwise it will lead to node that belongs to this availability zone register failure, see kubernetes/cloud-provider-openstack#1379 for further information. The maximum length of availability zone name is 63 as per labels limits.", - "type": "string" - }, - "rootVolume": { - "description": "rootVolume contains settings that will be used by the OpenStack machine provider to create the root volume attached to the VM. If not specified, no root volume will be created.", - "$ref": "#/definitions/io.openshift.machine.v1.RootVolume" + "boot": { + "description": "AzureBootDiagnostics configures the boot diagnostics settings for the virtual machine. This allows you to configure capturing serial output from the virtual machine on boot. This is useful for debugging software based launch issues.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.AzureBootDiagnostics" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "OpenStackFailureDomain", + "Version": "v1beta1", + "Kind": "AzureDiagnostics", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.PowerVSMachineProviderConfig": { - "description": "PowerVSMachineProviderConfig is the type that will be embedded in a Machine.Spec.ProviderSpec field for a PowerVS virtual machine. It is used by the PowerVS machine actuator to create a single Machine.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.AzureMachineProviderSpec": { + "description": "AzureMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an Azure virtual machine. It is used by the Azure machine actuator to create a single Machine. Required parameters such as location that are not specified by this configuration, will be defaulted by the actuator. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "serviceInstance", "image", - "network", - "keyPairName" + "osDisk", + "publicIP", + "subnet" ], "properties": { + "acceleratedNetworking": { + "description": "AcceleratedNetworking enables or disables Azure accelerated networking feature. Set to false by default. If true, then this will depend on whether the requested VMSize is supported. If set to true with an unsupported VMSize, Azure will return an error.", + "type": "boolean" + }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "applicationSecurityGroups": { + "description": "Application Security Groups that need to be attached to the machine's interface. No application security groups will be attached if zero-length.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "availabilitySet": { + "description": "AvailabilitySet specifies the availability set to use for this instance. Availability set should be precreated, before using this field.", + "type": "string" + }, + "capacityReservationGroupID": { + "description": "capacityReservationGroupID specifies the capacity reservation group resource id that should be used for allocating the virtual machine. The field size should be greater than 0 and the field input must start with '/'. The input for capacityReservationGroupID must be similar to '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/capacityReservationGroups/{capacityReservationGroupName}'. The keys which are used should be among 'subscriptions', 'providers' and 'resourcegroups' followed by valid ID or names respectively.", + "type": "string" + }, "credentialsSecret": { - "description": "credentialsSecret is a reference to the secret with IBM Cloud credentials.", - "$ref": "#/definitions/io.openshift.machine.v1.PowerVSSecretReference" + "description": "CredentialsSecret is a reference to the secret with Azure credentials.", + "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" + }, + "dataDisks": { + "description": "DataDisk specifies the parameters that are used to add one or more data disks to the machine.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.DataDisk" + } + }, + "diagnostics": { + "description": "Diagnostics configures the diagnostics settings for the virtual machine. This allows you to configure boot diagnostics such as capturing serial output from the virtual machine on boot. This is useful for debugging software based launch issues.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.AzureDiagnostics" }, "image": { - "description": "image is to identify the rhcos image uploaded to IBM COS bucket which is used to create the instance. supported image identifier in PowerVSResource are Name and ID and that can be obtained from IBM Cloud UI or IBM Cloud cli.", + "description": "Image is the OS image to use to create the instance.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.PowerVSResource" + "$ref": "#/definitions/io.openshift.machine.v1beta1.Image" }, - "keyPairName": { - "description": "keyPairName is the name of the KeyPair to use for SSH. The key pair will be exposed to the instance via the instance metadata service. On boot, the OS will copy the public keypair into the authorized keys for the core user.", + "internalLoadBalancer": { + "description": "InternalLoadBalancerName to use for this instance", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "location": { + "description": "Location is the region to use to create the instance", + "type": "string" + }, + "managedIdentity": { + "description": "ManagedIdentity to set managed identity name", + "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "natRule": { + "description": "NatRule to set inbound NAT rule of the load balancer", + "type": "integer", + "format": "int64" + }, + "networkResourceGroup": { + "description": "NetworkResourceGroup is the resource group for the virtual machine's network", + "type": "string" + }, + "osDisk": { + "description": "OSDisk represents the parameters for creating the OS disk.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.OSDisk" + }, + "publicIP": { + "description": "PublicIP if true a public IP will be used", + "type": "boolean", + "default": false + }, + "publicLoadBalancer": { + "description": "PublicLoadBalancer to use for this instance", + "type": "string" + }, + "resourceGroup": { + "description": "ResourceGroup is the resource group for the virtual machine", + "type": "string" + }, + "securityGroup": { + "description": "Network Security Group that needs to be attached to the machine's interface. No security group will be attached if empty.", + "type": "string" + }, + "securityProfile": { + "description": "SecurityProfile specifies the Security profile settings for a virtual machine.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.SecurityProfile" + }, + "spotVMOptions": { + "description": "SpotVMOptions allows the ability to specify the Machine should use a Spot VM", + "$ref": "#/definitions/io.openshift.machine.v1beta1.SpotVMOptions" + }, + "sshPublicKey": { + "description": "SSHPublicKey is the public key to use to SSH to the virtual machine.", + "type": "string" + }, + "subnet": { + "description": "Subnet to use for this instance", "type": "string", "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "loadBalancers": { - "description": "loadBalancers is the set of load balancers to which the new control plane instance should be added once it is created.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.LoadBalancerReference" + "tags": { + "description": "Tags is a list of tags to apply to the machine.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" } }, - "memoryGiB": { - "description": "memoryGiB is the size of a virtual machine's memory, in GiB. maximum value for the MemoryGiB depends on the selected SystemType. when SystemType is set to e880 maximum MemoryGiB value is 7463 GiB. when SystemType is set to e980 maximum MemoryGiB value is 15307 GiB. when SystemType is set to s922 maximum MemoryGiB value is 942 GiB. The minimum memory is 32 GiB. When omitted, this means the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is 32.", - "type": "integer", - "format": "int32" - }, - "metadata": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "network": { - "description": "network is the reference to the Network to use for this instance. supported network identifier in PowerVSResource are Name, ID and RegEx and that can be obtained from IBM Cloud UI or IBM Cloud cli.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.PowerVSResource" - }, - "processorType": { - "description": "processorType is the VM instance processor type. It must be set to one of the following values: Dedicated, Capped or Shared. Dedicated: resources are allocated for a specific client, The hypervisor makes a 1:1 binding of a partition’s processor to a physical processor core. Shared: Shared among other clients. Capped: Shared, but resources do not expand beyond those that are requested, the amount of CPU time is Capped to the value specified for the entitlement. if the processorType is selected as Dedicated, then processors value cannot be fractional. When omitted, this means that the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is Shared.", + "ultraSSDCapability": { + "description": "UltraSSDCapability enables or disables Azure UltraSSD capability for a virtual machine. This can be used to allow/disallow binding of Azure UltraSSD to the Machine both as Data Disks or via Persistent Volumes. This Azure feature is subject to a specific scope and certain limitations. More informations on this can be found in the official Azure documentation for Ultra Disks: (https://docs.microsoft.com/en-us/azure/virtual-machines/disks-enable-ultra-ssd?tabs=azure-portal#ga-scope-and-limitations).\n\nWhen omitted, if at least one Data Disk of type UltraSSD is specified, the platform will automatically enable the capability. If a Perisistent Volume backed by an UltraSSD is bound to a Pod on the Machine, when this field is ommitted, the platform will *not* automatically enable the capability (unless already enabled by the presence of an UltraSSD as Data Disk). This may manifest in the Pod being stuck in `ContainerCreating` phase. This defaulting behaviour may be subject to change in future.\n\nWhen set to \"Enabled\", if the capability is available for the Machine based on the scope and limitations described above, the capability will be set on the Machine. This will thus allow UltraSSD both as Data Disks and Persistent Volumes. If set to \"Enabled\" when the capability can't be available due to scope and limitations, the Machine will go into \"Failed\" state.\n\nWhen set to \"Disabled\", UltraSSDs will not be allowed either as Data Disks nor as Persistent Volumes. In this case if any UltraSSDs are specified as Data Disks on a Machine, the Machine will go into a \"Failed\" state. If instead any UltraSSDs are backing the volumes (via Persistent Volumes) of any Pods scheduled on a Node which is backed by the Machine, the Pod may get stuck in `ContainerCreating` phase.", "type": "string" }, - "processors": { - "description": "processors is the number of virtual processors in a virtual machine. when the processorType is selected as Dedicated the processors value cannot be fractional. maximum value for the Processors depends on the selected SystemType. when SystemType is set to e880 or e980 maximum Processors value is 143. when SystemType is set to s922 maximum Processors value is 15. minimum value for Processors depends on the selected ProcessorType. when ProcessorType is set as Shared or Capped, The minimum processors is 0.5. when ProcessorType is set as Dedicated, The minimum processors is 1. When omitted, this means that the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The default is set based on the selected ProcessorType. when ProcessorType selected as Dedicated, the default is set to 1. when ProcessorType selected as Shared or Capped, the default is set to 0.5.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" + "userDataSecret": { + "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", + "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" }, - "serviceInstance": { - "description": "serviceInstance is the reference to the Power VS service on which the server instance(VM) will be created. Power VS service is a container for all Power VS instances at a specific geographic region. serviceInstance can be created via IBM Cloud catalog or CLI. supported serviceInstance identifier in PowerVSResource are Name and ID and that can be obtained from IBM Cloud UI or IBM Cloud cli. More detail about Power VS service instance. https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1.PowerVSResource" + "vmSize": { + "description": "VMSize is the size of the VM to create.", + "type": "string" }, - "systemType": { - "description": "systemType is the System type used to host the instance. systemType determines the number of cores and memory that is available. Few of the supported SystemTypes are s922,e880,e980. e880 systemType available only in Dallas Datacenters. e980 systemType available in Datacenters except Dallas and Washington. When omitted, this means that the user has no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is s922 which is generally available.", + "vnet": { + "description": "Vnet to set virtual network name", "type": "string" }, - "userDataSecret": { - "description": "userDataSecret contains a local reference to a secret that contains the UserData to apply to the instance.", - "$ref": "#/definitions/io.openshift.machine.v1.PowerVSSecretReference" + "zone": { + "description": "Availability Zone for the virtual machine. If nil, the virtual machine should be deployed to no zone", + "type": "string" } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "PowerVSMachineProviderConfig", + "Version": "v1beta1", + "Kind": "AzureMachineProviderSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.PowerVSMachineProviderStatus": { - "description": "PowerVSMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains PowerVS-specific status information.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.AzureMachineProviderStatus": { + "description": "AzureMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains Azure-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "properties": { "apiVersion": { @@ -35847,171 +39660,190 @@ "type": "string" }, "conditions": { - "description": "conditions is a set of conditions associated with the Machine to indicate errors or other status", + "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status.", "type": "array", "items": { "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + } }, - "instanceId": { - "description": "instanceId is the instance ID of the machine created in PowerVS instanceId uniquely identifies a Power VS server instance(VM) under a Power VS service. This will help in updating or deleting a VM in Power VS Cloud", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "instanceState": { - "description": "instanceState is the state of the PowerVS instance for this machine Possible instance states are Active, Build, ShutOff, Reboot This is used to display additional information to user regarding instance current state", - "type": "string" + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "vmId": { + "description": "VMID is the ID of the virtual machine created in Azure.", "type": "string" }, - "serviceInstanceID": { - "description": "serviceInstanceID is the reference to the Power VS ServiceInstance on which the machine instance will be created. serviceInstanceID uniquely identifies the Power VS service By setting serviceInstanceID it will become easy and efficient to fetch a server instance(VM) within Power VS Cloud.", + "vmState": { + "description": "VMState is the provisioning state of the Azure virtual machine.", "type": "string" } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "PowerVSMachineProviderStatus", + "Version": "v1beta1", + "Kind": "AzureMachineProviderStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.PowerVSResource": { - "description": "PowerVSResource is a reference to a specific PowerVS resource by ID, Name or RegEx Only one of ID, Name or RegEx may be specified. Specifying more than one will result in a validation error.", + "io.openshift.machine.v1beta1.BlockDeviceMappingSpec": { + "description": "BlockDeviceMappingSpec describes a block device mapping", "type": "object", "properties": { - "id": { - "description": "ID of resource", + "deviceName": { + "description": "The device name exposed to the machine (for example, /dev/sdh or xvdh).", "type": "string" }, - "name": { - "description": "Name of resource", - "type": "string" + "ebs": { + "description": "Parameters used to automatically set up EBS volumes when the machine is launched.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.EBSBlockDeviceSpec" }, - "regex": { - "description": "Regex to find resource Regex contains the pattern to match to find a resource", + "noDevice": { + "description": "Suppresses the specified device included in the block device mapping of the AMI.", "type": "string" }, - "type": { - "description": "Type identifies the resource type for this entry. Valid values are ID, Name and RegEx", + "virtualName": { + "description": "The virtual device name (ephemeralN). Machine store volumes are numbered starting from 0. An machine type with 2 available machine store volumes can specify mappings for ephemeral0 and ephemeral1.The number of available machine store volumes depends on the machine type. After you connect to the machine, you must mount the volume.\n\nConstraints: For M3 machines, you must specify machine store volumes in the block device mapping for the machine. When you launch an M3 machine, we ignore any machine store volumes specified in the block device mapping for the AMI.", "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "PowerVSResource", + "Version": "v1beta1", + "Kind": "BlockDeviceMappingSpec", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "fields-to-discriminateBy": { - "id": "ID", - "name": "Name", - "regex": "RegEx", - "type": "Type" - } - } - ] + } }, - "io.openshift.machine.v1.PowerVSSecretReference": { - "description": "PowerVSSecretReference contains enough information to locate the referenced secret inside the same namespace.", + "io.openshift.machine.v1beta1.Condition": { + "description": "Condition defines an observation of a Machine API resource operational state.", "type": "object", + "required": [ + "type", + "status" + ], "properties": { - "name": { - "description": "Name of the secret.", + "lastTransitionTime": { + "description": "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "A human readable message indicating details about the transition. This field may be empty.", + "type": "string" + }, + "reason": { + "description": "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", "type": "string" + }, + "severity": { + "description": "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + "type": "string" + }, + "status": { + "description": "Status of the condition, one of True, False, Unknown.", + "type": "string", + "default": "" + }, + "type": { + "description": "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "PowerVSSecretReference", + "Version": "v1beta1", + "Kind": "Condition", "Scope": "Namespaced" - }, - "x-kubernetes-map-type": "atomic" + } }, - "io.openshift.machine.v1.RootVolume": { - "description": "RootVolume represents the volume metadata to boot from. The original RootVolume struct is defined in the v1alpha1 but it's not best practice to use it directly here so we define a new one that should stay in sync with the original one.", + "io.openshift.machine.v1beta1.ConfidentialVM": { + "description": "ConfidentialVM defines the UEFI settings for the virtual machine.", "type": "object", - "required": [ - "volumeType" - ], "properties": { - "availabilityZone": { - "description": "availabilityZone specifies the Cinder availability zone where the root volume will be created. If not specifified, the root volume will be created in the availability zone specified by the volume type in the cinder configuration. If the volume type (configured in the OpenStack cluster) does not specify an availability zone, the root volume will be created in the default availability zone specified in the cinder configuration. See https://docs.openstack.org/cinder/latest/admin/availability-zone-type.html for more details. If the OpenStack cluster is deployed with the cross_az_attach configuration option set to false, the root volume will have to be in the same availability zone as the VM (defined by OpenStackFailureDomain.AvailabilityZone). Availability zone names must NOT contain spaces otherwise it will lead to volume that belongs to this availability zone register failure, see kubernetes/cloud-provider-openstack#1379 for further information. The maximum length of availability zone name is 63 as per labels limits.", - "type": "string" - }, - "volumeType": { - "description": "volumeType specifies the type of the root volume that will be provisioned. The maximum length of a volume type name is 255 characters, as per the OpenStack limit.", - "type": "string", - "default": "" + "uefiSettings": { + "description": "uefiSettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.UEFISettings" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "RootVolume", + "Version": "v1beta1", + "Kind": "ConfidentialVM", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.SystemDiskProperties": { - "description": "SystemDiskProperties contains the information regarding the system disk including performance, size, name, and category", + "io.openshift.machine.v1beta1.DataDisk": { + "description": "DataDisk specifies the parameters that are used to add one or more data disks to the machine. A Data Disk is a managed disk that's attached to a virtual machine to store application data. It differs from an OS Disk as it doesn't come with a pre-installed OS, and it cannot contain the boot volume. It is registered as SCSI drive and labeled with the chosen `lun`. e.g. for `lun: 0` the raw disk device will be available at `/dev/disk/azure/scsi1/lun0`.\n\nAs the Data Disk disk device is attached raw to the virtual machine, it will need to be partitioned, formatted with a filesystem and mounted, in order for it to be usable. This can be done by creating a custom userdata Secret with custom Ignition configuration to achieve the desired initialization. At this stage the previously defined `lun` is to be used as the \"device\" key for referencing the raw disk device to be initialized. Once the custom userdata Secret has been created, it can be referenced in the Machine's `.providerSpec.userDataSecret`. For further guidance and examples, please refer to the official OpenShift docs.", "type": "object", + "required": [ + "nameSuffix", + "diskSizeGB", + "deletionPolicy" + ], "properties": { - "category": { - "description": "Category is the category of the system disk. Valid values: cloud_essd: ESSD. When the parameter is set to this value, you can use the SystemDisk.PerformanceLevel parameter to specify the performance level of the disk. cloud_efficiency: ultra disk. cloud_ssd: standard SSD. cloud: basic disk. Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently for non-I/O optimized instances of retired instance types, the default is `cloud`. Currently for other instances, the default is `cloud_efficiency`.", + "cachingType": { + "description": "CachingType specifies the caching requirements. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is CachingTypeNone.", "type": "string" }, - "name": { - "description": "Name is the name of the system disk. If the name is specified the name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-). Empty value means the platform chooses a default, which is subject to change over time. Currently the default is `\"\"`.", - "type": "string" + "deletionPolicy": { + "description": "DeletionPolicy specifies the data disk deletion policy upon Machine deletion. Possible values are \"Delete\",\"Detach\". When \"Delete\" is used the data disk is deleted when the Machine is deleted. When \"Detach\" is used the data disk is detached from the Machine and retained when the Machine is deleted.", + "type": "string", + "default": "" }, - "performanceLevel": { - "description": "PerformanceLevel is the performance level of the ESSD used as the system disk. Valid values:\n\nPL0: A single ESSD can deliver up to 10,000 random read/write IOPS. PL1: A single ESSD can deliver up to 50,000 random read/write IOPS. PL2: A single ESSD can deliver up to 100,000 random read/write IOPS. PL3: A single ESSD can deliver up to 1,000,000 random read/write IOPS. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is `PL1`. For more information about ESSD performance levels, see ESSDs.", - "type": "string" + "diskSizeGB": { + "description": "DiskSizeGB is the size in GB to assign to the data disk.", + "type": "integer", + "format": "int32", + "default": 0 }, - "size": { - "description": "Size is the size of the system disk. Unit: GiB. Valid values: 20 to 500. The value must be at least 20 and greater than or equal to the size of the image. Empty value means the platform chooses a default, which is subject to change over time. Currently the default is `40` or the size of the image depending on whichever is greater.", + "lun": { + "description": "Lun Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM. This value is also needed for referencing the data disks devices within userdata to perform disk initialization through Ignition (e.g. partition/format/mount). The value must be between 0 and 63.", "type": "integer", - "format": "int64" + "format": "int32" + }, + "managedDisk": { + "description": "ManagedDisk specifies the Managed Disk parameters for the data disk. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is a ManagedDisk with with storageAccountType: \"Premium_LRS\" and diskEncryptionSet.id: \"Default\".", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.DataDiskManagedDiskParameters" + }, + "nameSuffix": { + "description": "NameSuffix is the suffix to be appended to the machine name to generate the disk name. Each disk name will be in format \u003cmachineName\u003e_\u003cnameSuffix\u003e. NameSuffix name must start and finish with an alphanumeric character and can only contain letters, numbers, underscores, periods or hyphens. The overall disk name must not exceed 80 chars in length.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "SystemDiskProperties", + "Version": "v1beta1", + "Kind": "DataDisk", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.Tag": { - "description": "Tag The tags of ECS Instance", + "io.openshift.machine.v1beta1.DataDiskManagedDiskParameters": { + "description": "DataDiskManagedDiskParameters is the parameters of a DataDisk managed disk.", "type": "object", "required": [ - "Key", - "Value" + "storageAccountType" ], "properties": { - "Key": { - "description": "Key is the name of the key pair", - "type": "string", - "default": "" + "diskEncryptionSet": { + "description": "DiskEncryptionSet is the disk encryption set properties. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is a DiskEncryptionSet with id: \"Default\".", + "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskEncryptionSetParameters" }, - "Value": { - "description": "Value is the value or data of the key pair", + "storageAccountType": { + "description": "StorageAccountType is the storage account type to use. Possible values include \"Standard_LRS\", \"Premium_LRS\" and \"UltraSSD_LRS\".", "type": "string", "default": "" } @@ -36019,227 +39851,210 @@ "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "Tag", + "Version": "v1beta1", + "Kind": "DataDiskManagedDiskParameters", "Scope": "Namespaced" } }, - "io.openshift.machine.v1.VSphereFailureDomain": { - "description": "VSphereFailureDomain configures failure domain information for the vSphere platform", + "io.openshift.machine.v1beta1.DiskEncryptionSetParameters": { + "description": "DiskEncryptionSetParameters is the disk encryption set properties", "type": "object", - "required": [ - "name" - ], "properties": { - "name": { - "description": "name of the failure domain in which the vSphere machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource. When balancing machines across failure domains, the control plane machine set will inject configuration from the Infrastructure resource into the machine providerSpec to allocate the machine to a failure domain.", - "type": "string", - "default": "" + "id": { + "description": "ID is the disk encryption set ID Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is: \"Default\".", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1", - "Kind": "VSphereFailureDomain", + "Version": "v1beta1", + "Kind": "DiskEncryptionSetParameters", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.AdditionalBlockDevice": { - "description": "additionalBlockDevice is a block device to attach to the server.", + "io.openshift.machine.v1beta1.DiskSettings": { + "description": "DiskSettings describe ephemeral disk settings for the os disk.", "type": "object", - "required": [ - "name", - "sizeGiB", - "storage" - ], "properties": { - "name": { - "description": "name of the block device in the context of a machine. If the block device is a volume, the Cinder volume will be named as a combination of the machine name and this name. Also, this name will be used for tagging the block device. Information about the block device tag can be obtained from the OpenStack metadata API or the config drive.", - "type": "string", - "default": "" - }, - "sizeGiB": { - "description": "sizeGiB is the size of the block device in gibibytes (GiB).", - "type": "integer", - "format": "int32", - "default": 0 - }, - "storage": { - "description": "storage specifies the storage type of the block device and additional storage options.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.BlockDeviceStorage" + "ephemeralStorageLocation": { + "description": "EphemeralStorageLocation enables ephemeral OS when set to 'Local'. Possible values include: 'Local'. See https://docs.microsoft.com/en-us/azure/virtual-machines/ephemeral-os-disks for full details. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is that disks are saved to remote Azure storage.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "AdditionalBlockDevice", + "Version": "v1beta1", + "Kind": "DiskSettings", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.AddressPair": { + "io.openshift.machine.v1beta1.EBSBlockDeviceSpec": { + "description": "EBSBlockDeviceSpec describes a block device for an EBS volume. https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EbsBlockDevice", "type": "object", "properties": { - "ipAddress": { - "type": "string" + "deleteOnTermination": { + "description": "Indicates whether the EBS volume is deleted on machine termination.", + "type": "boolean" }, - "macAddress": { + "encrypted": { + "description": "Indicates whether the EBS volume is encrypted. Encrypted Amazon EBS volumes may only be attached to machines that support Amazon EBS encryption.", + "type": "boolean" + }, + "iops": { + "description": "The number of I/O operations per second (IOPS) that the volume supports. For io1, this represents the number of IOPS that are provisioned for the volume. For gp2, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting. For more information about General Purpose SSD baseline performance, I/O credits, and bursting, see Amazon EBS Volume Types (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html) in the Amazon Elastic Compute Cloud User Guide.\n\nMinimal and maximal IOPS for io1 and gp2 are constrained. Please, check https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html for precise boundaries for individual volumes.\n\nCondition: This parameter is required for requests to create io1 volumes; it is not used in requests to create gp2, st1, sc1, or standard volumes.", + "type": "integer", + "format": "int64" + }, + "kmsKey": { + "description": "Indicates the KMS key that should be used to encrypt the Amazon EBS volume.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" + }, + "volumeSize": { + "description": "The size of the volume, in GiB.\n\nConstraints: 1-16384 for General Purpose SSD (gp2), 4-16384 for Provisioned IOPS SSD (io1), 500-16384 for Throughput Optimized HDD (st1), 500-16384 for Cold HDD (sc1), and 1-1024 for Magnetic (standard) volumes. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.\n\nDefault: If you're creating the volume from a snapshot and don't specify a volume size, the default is the snapshot size.", + "type": "integer", + "format": "int64" + }, + "volumeType": { + "description": "The volume type: gp2, io1, st1, sc1, or standard. Default: standard", "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "AddressPair", + "Version": "v1beta1", + "Kind": "EBSBlockDeviceSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.BlockDeviceStorage": { - "description": "blockDeviceStorage is the storage type of a block device to create and contains additional storage options.", + "io.openshift.machine.v1beta1.Filter": { + "description": "Filter is a filter used to identify an AWS resource", "type": "object", "required": [ - "type" + "name" ], "properties": { - "type": { - "description": "type is the type of block device to create. This can be either \"Volume\" or \"Local\".", + "name": { + "description": "Name of the filter. Filter names are case-sensitive.", "type": "string", "default": "" }, - "volume": { - "description": "volume contains additional storage options for a volume block device.", - "$ref": "#/definitions/io.openshift.machine.v1alpha1.BlockDeviceVolume" + "values": { + "description": "Values includes one or more filter values. Filter values are case-sensitive.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "BlockDeviceStorage", + "Version": "v1beta1", + "Kind": "Filter", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "volume": "Volume" - } - } - ] + } }, - "io.openshift.machine.v1alpha1.BlockDeviceVolume": { - "description": "blockDeviceVolume contains additional storage options for a volume block device.", + "io.openshift.machine.v1beta1.GCPDisk": { + "description": "GCPDisk describes disks for GCP.", "type": "object", + "required": [ + "autoDelete", + "boot", + "sizeGb", + "type", + "image", + "labels" + ], "properties": { - "availabilityZone": { - "description": "availabilityZone is the volume availability zone to create the volume in. If omitted, the availability zone of the server will be used. The availability zone must NOT contain spaces otherwise it will lead to volume that belongs to this availability zone register failure, see kubernetes/cloud-provider-openstack#1379 for further information.", - "type": "string" + "autoDelete": { + "description": "AutoDelete indicates if the disk will be auto-deleted when the instance is deleted (default false).", + "type": "boolean", + "default": false + }, + "boot": { + "description": "Boot indicates if this is a boot disk (default false).", + "type": "boolean", + "default": false + }, + "encryptionKey": { + "description": "EncryptionKey is the customer-supplied encryption key of the disk.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPEncryptionKeyReference" + }, + "image": { + "description": "Image is the source image to create this disk.", + "type": "string", + "default": "" + }, + "labels": { + "description": "Labels list of labels to apply to the disk.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "sizeGb": { + "description": "SizeGB is the size of the disk (in GB).", + "type": "integer", + "format": "int64", + "default": 0 }, "type": { - "description": "type is the Cinder volume type of the volume. If omitted, the default Cinder volume type that is configured in the OpenStack cloud will be used.", - "type": "string" + "description": "Type is the type of the disk (eg: pd-standard).", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "BlockDeviceVolume", + "Version": "v1beta1", + "Kind": "GCPDisk", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.Filter": { - "type": "object", - "properties": { - "adminStateUp": { - "description": "Deprecated: adminStateUp is silently ignored. It has no replacement.", - "type": "boolean" - }, - "description": { - "description": "description filters networks by description.", - "type": "string" - }, - "id": { - "description": "Deprecated: use NetworkParam.uuid instead. Ignored if NetworkParam.uuid is set.", - "type": "string" - }, - "limit": { - "description": "Deprecated: limit is silently ignored. It has no replacement.", - "type": "integer", - "format": "int32" - }, - "marker": { - "description": "Deprecated: marker is silently ignored. It has no replacement.", - "type": "string" - }, - "name": { - "description": "name filters networks by name.", - "type": "string" - }, - "notTags": { - "description": "notTags filters by networks which don't match all specified tags. NOT (t1 AND t2...) Multiple tags are comma separated.", - "type": "string" - }, - "notTagsAny": { - "description": "notTagsAny filters by networks which don't match any specified tags. NOT (t1 OR t2...) Multiple tags are comma separated.", - "type": "string" - }, - "projectId": { - "description": "projectId filters networks by project ID.", - "type": "string" - }, - "shared": { - "description": "Deprecated: shared is silently ignored. It has no replacement.", - "type": "boolean" - }, - "sortDir": { - "description": "Deprecated: sortDir is silently ignored. It has no replacement.", - "type": "string" - }, - "sortKey": { - "description": "Deprecated: sortKey is silently ignored. It has no replacement.", - "type": "string" - }, - "status": { - "description": "Deprecated: status is silently ignored. It has no replacement.", - "type": "string" - }, - "tags": { - "description": "tags filters by networks containing all specified tags. Multiple tags are comma separated.", - "type": "string" - }, - "tagsAny": { - "description": "tagsAny filters by networks containing any specified tags. Multiple tags are comma separated.", - "type": "string" + "io.openshift.machine.v1beta1.GCPEncryptionKeyReference": { + "description": "GCPEncryptionKeyReference describes the encryptionKey to use for a disk's encryption.", + "type": "object", + "properties": { + "kmsKey": { + "description": "KMSKeyName is the reference KMS key, in the format", + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPKMSKeyReference" }, - "tenantId": { - "description": "tenantId filters networks by tenant ID. Deprecated: use projectId instead. tenantId will be ignored if projectId is set.", + "kmsKeyServiceAccount": { + "description": "KMSKeyServiceAccount is the service account being used for the encryption request for the given KMS key. If absent, the Compute Engine default service account is used. See https://cloud.google.com/compute/docs/access/service-accounts#compute_engine_service_account for details on the default service account.", "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "Filter", + "Version": "v1beta1", + "Kind": "GCPEncryptionKeyReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.FixedIPs": { + "io.openshift.machine.v1beta1.GCPGPUConfig": { + "description": "GCPGPUConfig describes type and count of GPUs attached to the instance on GCP.", "type": "object", "required": [ - "subnetID" + "count", + "type" ], "properties": { - "ipAddress": { - "description": "ipAddress is a specific IP address to use in the given subnet. Port creation will fail if the address is not available. If not specified, an available IP from the given subnet will be selected automatically.", - "type": "string" + "count": { + "description": "Count is the number of GPUs to be attached to an instance.", + "type": "integer", + "format": "int32", + "default": 0 }, - "subnetID": { - "description": "subnetID specifies the ID of the subnet where the fixed IP will be allocated.", + "type": { + "description": "Type is the type of GPU to be attached to an instance. Supported GPU types are: nvidia-tesla-k80, nvidia-tesla-p100, nvidia-tesla-v100, nvidia-tesla-p4, nvidia-tesla-t4", "type": "string", "default": "" } @@ -36247,711 +40062,796 @@ "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "FixedIPs", + "Version": "v1beta1", + "Kind": "GCPGPUConfig", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.NetworkParam": { + "io.openshift.machine.v1beta1.GCPKMSKeyReference": { + "description": "GCPKMSKeyReference gathers required fields for looking up a GCP KMS Key", "type": "object", + "required": [ + "name", + "keyRing", + "location" + ], "properties": { - "filter": { - "description": "Filters for optional network query", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.Filter" - }, - "fixedIp": { - "description": "A fixed IPv4 address for the NIC.", - "type": "string" - }, - "noAllowedAddressPairs": { - "description": "NoAllowedAddressPairs disables creation of allowed address pairs for the network ports", - "type": "boolean" - }, - "portSecurity": { - "description": "PortSecurity optionally enables or disables security on ports managed by OpenStack", - "type": "boolean" - }, - "portTags": { - "description": "PortTags allows users to specify a list of tags to add to ports created in a given network", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "profile": { - "description": "A dictionary that enables the application running on the specified host to pass and receive virtual network interface (VIF) port-specific information to the plug-in.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "keyRing": { + "description": "KeyRing is the name of the KMS Key Ring which the KMS Key belongs to.", + "type": "string", + "default": "" }, - "subnets": { - "description": "Subnet within a network to use", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.SubnetParam" - } + "location": { + "description": "Location is the GCP location in which the Key Ring exists.", + "type": "string", + "default": "" }, - "uuid": { - "description": "The UUID of the network. Required if you omit the port attribute.", - "type": "string" + "name": { + "description": "Name is the name of the customer managed encryption key to be used for the disk encryption.", + "type": "string", + "default": "" }, - "vnicType": { - "description": "The virtual network interface card (vNIC) type that is bound to the neutron port.", + "projectID": { + "description": "ProjectID is the ID of the Project in which the KMS Key Ring exists. Defaults to the VM ProjectID if not set.", "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "NetworkParam", + "Version": "v1beta1", + "Kind": "GCPKMSKeyReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.OpenstackProviderSpec": { - "description": "OpenstackProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an OpenStack Instance. It is used by the Openstack machine actuator to create a single machine instance. Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.machine.v1beta1.GCPMachineProviderSpec": { + "description": "GCPMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an GCP virtual machine. It is used by the GCP machine actuator to create a single Machine. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "cloudsSecret", - "cloudName", - "flavor", - "image" + "canIPForward", + "deletionProtection", + "serviceAccounts", + "machineType", + "region", + "zone" ], "properties": { - "additionalBlockDevices": { - "description": "additionalBlockDevices is a list of specifications for additional block devices to attach to the server instance", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.AdditionalBlockDevice" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" - }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "availabilityZone": { - "description": "The availability zone from which to launch the server.", - "type": "string" - }, - "cloudName": { - "description": "The name of the cloud to use from the clouds secret", - "type": "string", - "default": "" + "canIPForward": { + "description": "CanIPForward Allows this instance to send and receive packets with non-matching destination or source IPs. This is required if you plan to use this instance to forward routes.", + "type": "boolean", + "default": false }, - "cloudsSecret": { - "description": "The name of the secret containing the openstack credentials", - "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" + "confidentialCompute": { + "description": "confidentialCompute Defines whether the instance should have confidential compute enabled. If enabled OnHostMaintenance is required to be set to \"Terminate\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is false.", + "type": "string" }, - "configDrive": { - "description": "Config Drive support", - "type": "boolean" + "credentialsSecret": { + "description": "CredentialsSecret is a reference to the secret with GCP credentials.", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" }, - "flavor": { - "description": "The flavor reference for the flavor for your server instance.", - "type": "string", - "default": "" + "deletionProtection": { + "description": "DeletionProtection whether the resource should be protected against deletion.", + "type": "boolean", + "default": false }, - "floatingIP": { - "description": "floatingIP specifies a floating IP to be associated with the machine. Note that it is not safe to use this parameter in a MachineSet, as only one Machine may be assigned the same floating IP.\n\nDeprecated: floatingIP will be removed in a future release as it cannot be implemented correctly.", - "type": "string" + "disks": { + "description": "Disks is a list of disks to be attached to the VM.", + "type": "array", + "items": { + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPDisk" + } }, - "image": { - "description": "The name of the image to use for your server instance. If the RootVolume is specified, this will be ignored and use rootVolume directly.", - "type": "string", - "default": "" + "gcpMetadata": { + "description": "Metadata key/value pairs to apply to the VM.", + "type": "array", + "items": { + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPMetadata" + } }, - "keyName": { - "description": "The ssh key to inject in the instance", - "type": "string" + "gpus": { + "description": "GPUs is a list of GPUs to be attached to the VM.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPGPUConfig" + } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "labels": { + "description": "Labels list of labels to apply to the VM.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "machineType": { + "description": "MachineType is the machine type to use for the VM.", + "type": "string", + "default": "" + }, "metadata": { "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "networks": { - "description": "A networks object. Required parameter when there are multiple networks defined for the tenant. When you do not specify the networks parameter, the server attaches to the only network created for the current tenant.", + "networkInterfaces": { + "description": "NetworkInterfaces is a list of network interfaces to be attached to the VM.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.NetworkParam" + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPNetworkInterface" } }, - "ports": { - "description": "Create and assign additional ports to instances", + "onHostMaintenance": { + "description": "OnHostMaintenance determines the behavior when a maintenance event occurs that might cause the instance to reboot. This is required to be set to \"Terminate\" if you want to provision machine with attached GPUs. Otherwise, allowed values are \"Migrate\" and \"Terminate\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is \"Migrate\".", + "type": "string" + }, + "preemptible": { + "description": "Preemptible indicates if created instance is preemptible.", + "type": "boolean" + }, + "projectID": { + "description": "ProjectID is the project in which the GCP machine provider will create the VM.", + "type": "string" + }, + "region": { + "description": "Region is the region in which the GCP machine provider will create the VM.", + "type": "string", + "default": "" + }, + "resourceManagerTags": { + "description": "resourceManagerTags is an optional list of tags to apply to the GCP resources created for the cluster. See https://cloud.google.com/resource-manager/docs/tags/tags-overview for information on tagging GCP resources. GCP supports a maximum of 50 tags per resource.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.PortOpts" - } + "$ref": "#/definitions/io.openshift.machine.v1beta1.ResourceManagerTag" + }, + "x-kubernetes-list-map-keys": [ + "key" + ], + "x-kubernetes-list-type": "map" }, - "primarySubnet": { - "description": "The subnet that a set of machines will get ingress/egress traffic from", + "restartPolicy": { + "description": "RestartPolicy determines the behavior when an instance crashes or the underlying infrastructure provider stops the instance as part of a maintenance event (default \"Always\"). Cannot be \"Always\" with preemptible instances. Otherwise, allowed values are \"Always\" and \"Never\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is \"Always\". RestartPolicy represents AutomaticRestart in GCP compute api", "type": "string" }, - "rootVolume": { - "description": "The volume metadata to boot from", - "$ref": "#/definitions/io.openshift.machine.v1alpha1.RootVolume" - }, - "securityGroups": { - "description": "The names of the security groups to assign to the instance", + "serviceAccounts": { + "description": "ServiceAccounts is a list of GCP service accounts to be used by the VM.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.SecurityGroupParam" + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPServiceAccount" } }, - "serverGroupID": { - "description": "The server group to assign the machine to.", - "type": "string" - }, - "serverGroupName": { - "description": "The server group to assign the machine to. A server group with that name will be created if it does not exist. If both ServerGroupID and ServerGroupName are non-empty, they must refer to the same OpenStack resource.", - "type": "string" + "shieldedInstanceConfig": { + "description": "ShieldedInstanceConfig is the Shielded VM configuration for the VM", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPShieldedInstanceConfig" }, - "serverMetadata": { - "description": "Metadata mapping. Allows you to create a map of key value pairs to add to the server instance.", - "type": "object", - "additionalProperties": { + "tags": { + "description": "Tags list of network tags to apply to the VM.", + "type": "array", + "items": { "type": "string", "default": "" } }, - "sshUserName": { - "description": "The machine ssh username", - "type": "string" - }, - "tags": { - "description": "Machine tags Requires Nova api 2.52 minimum!", + "targetPools": { + "description": "TargetPools are used for network TCP/UDP load balancing. A target pool references member instances, an associated legacy HttpHealthCheck resource, and, optionally, a backup target pool", "type": "array", "items": { "type": "string", "default": "" } }, - "trunk": { - "description": "Whether the server instance is created on a trunk port or not.", - "type": "boolean" - }, "userDataSecret": { - "description": "The name of the secret containing the user data (startup script in most cases)", - "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" + "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + }, + "zone": { + "description": "Zone is the zone in which the GCP machine provider will create the VM.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "OpenstackProviderSpec", + "Version": "v1beta1", + "Kind": "GCPMachineProviderSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.PortOpts": { + "io.openshift.machine.v1beta1.GCPMachineProviderStatus": { + "description": "GCPMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains GCP-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "networkID" - ], "properties": { - "adminStateUp": { - "description": "adminStateUp sets the administrative state of the created port to up (true), or down (false).", - "type": "boolean" - }, - "allowedAddressPairs": { - "description": "allowedAddressPairs specifies a set of allowed address pairs to add to the port.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.AddressPair" - } - }, - "description": { - "description": "description specifies the description of the created port.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "fixedIPs": { - "description": "fixedIPs specifies a set of fixed IPs to assign to the port. They must all be valid for the port's network.", + "conditions": { + "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.FixedIPs" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" } }, - "hostID": { - "description": "The ID of the host where the port is allocated. Do not use this field: it cannot be used correctly. Deprecated: hostID is silently ignored. It will be removed with no replacement.", + "instanceId": { + "description": "InstanceID is the ID of the instance in GCP", "type": "string" }, - "macAddress": { - "description": "macAddress specifies the MAC address of the created port.", + "instanceState": { + "description": "InstanceState is the provisioning state of the GCP Instance.", "type": "string" }, - "nameSuffix": { - "description": "If nameSuffix is specified the created port will be named \u003cmachine name\u003e-\u003cnameSuffix\u003e. If not specified the port will be named \u003cmachine-name\u003e-\u003cindex of this port\u003e.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "networkID": { - "description": "networkID is the ID of the network the port will be created in. It is required.", + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "GCPMachineProviderStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.GCPMetadata": { + "description": "GCPMetadata describes metadata for GCP.", + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "description": "Key is the metadata key.", "type": "string", "default": "" }, - "portSecurity": { - "description": "enable or disable security on a given port incompatible with securityGroups and allowedAddressPairs", - "type": "boolean" - }, - "profile": { - "description": "A dictionary that enables the application running on the specified host to pass and receive virtual network interface (VIF) port-specific information to the plug-in.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "value": { + "description": "Value is the metadata value.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "GCPMetadata", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.GCPNetworkInterface": { + "description": "GCPNetworkInterface describes network interfaces for GCP", + "type": "object", + "properties": { + "network": { + "description": "Network is the network name.", + "type": "string" }, "projectID": { - "description": "projectID specifies the project ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended.", + "description": "ProjectID is the project in which the GCP machine provider will create the VM.", "type": "string" }, - "securityGroups": { - "description": "securityGroups specifies a set of security group UUIDs to use instead of the machine's default security groups. The default security groups will be used if this is left empty or not specified.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "publicIP": { + "description": "PublicIP indicates if true a public IP will be used", + "type": "boolean" }, - "tags": { - "description": "tags species a set of tags to add to the port.", + "subnetwork": { + "description": "Subnetwork is the subnetwork name.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "GCPNetworkInterface", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.GCPServiceAccount": { + "description": "GCPServiceAccount describes service accounts for GCP.", + "type": "object", + "required": [ + "email", + "scopes" + ], + "properties": { + "email": { + "description": "Email is the service account email.", + "type": "string", + "default": "" + }, + "scopes": { + "description": "Scopes list of scopes to be assigned to the service account.", "type": "array", "items": { "type": "string", "default": "" } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "GCPServiceAccount", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.GCPShieldedInstanceConfig": { + "description": "GCPShieldedInstanceConfig describes the shielded VM configuration of the instance on GCP. Shielded VM configuration allow users to enable and disable Secure Boot, vTPM, and Integrity Monitoring.", + "type": "object", + "properties": { + "integrityMonitoring": { + "description": "IntegrityMonitoring determines whether the instance should have integrity monitoring that verify the runtime boot integrity. Compares the most recent boot measurements to the integrity policy baseline and return a pair of pass/fail results depending on whether they match or not. If omitted, the platform chooses a default, which is subject to change over time, currently that default is Enabled.", + "type": "string" }, - "tenantID": { - "description": "tenantID specifies the tenant ID of the created port. Note that this requires OpenShift to have administrative permissions, which is typically not the case. Use of this field is not recommended. Deprecated: use projectID instead. It will be ignored if projectID is set.", + "secureBoot": { + "description": "SecureBoot Defines whether the instance should have secure boot enabled. Secure Boot verify the digital signature of all boot components, and halting the boot process if signature verification fails. If omitted, the platform chooses a default, which is subject to change over time, currently that default is Disabled.", "type": "string" }, - "trunk": { - "description": "Enables and disables trunk at port level. If not provided, openStackMachine.Spec.Trunk is inherited.", - "type": "boolean" + "virtualizedTrustedPlatformModule": { + "description": "VirtualizedTrustedPlatformModule enable virtualized trusted platform module measurements to create a known good boot integrity policy baseline. The integrity policy baseline is used for comparison with measurements from subsequent VM boots to determine if anything has changed. This is required to be set to \"Enabled\" if IntegrityMonitoring is enabled. If omitted, the platform chooses a default, which is subject to change over time, currently that default is Enabled.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "GCPShieldedInstanceConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.Image": { + "description": "Image is a mirror of azure sdk compute.ImageReference", + "type": "object", + "required": [ + "publisher", + "offer", + "sku", + "version", + "resourceID" + ], + "properties": { + "offer": { + "description": "Offer specifies the name of a group of related images created by the publisher. For example, UbuntuServer, WindowsServer", + "type": "string", + "default": "" }, - "vnicType": { - "description": "The virtual network interface card (vNIC) type that is bound to the neutron port.", + "publisher": { + "description": "Publisher is the name of the organization that created the image", + "type": "string", + "default": "" + }, + "resourceID": { + "description": "ResourceID specifies an image to use by ID", + "type": "string", + "default": "" + }, + "sku": { + "description": "SKU specifies an instance of an offer, such as a major release of a distribution. For example, 18.04-LTS, 2019-Datacenter", + "type": "string", + "default": "" + }, + "type": { + "description": "Type identifies the source of the image and related information, such as purchase plans. Valid values are \"ID\", \"MarketplaceWithPlan\", \"MarketplaceNoPlan\", and omitted, which means no opinion and the platform chooses a good default which may change over time. Currently that default is \"MarketplaceNoPlan\" if publisher data is supplied, or \"ID\" if not. For more information about purchase plans, see: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/cli-ps-findimage#check-the-purchase-plan-information", "type": "string" + }, + "version": { + "description": "Version specifies the version of an image sku. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal numbers. Specify 'latest' to use the latest version of an image available at deploy time. Even if you use 'latest', the VM image will not automatically update after deploy time even if a new version becomes available.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "PortOpts", + "Version": "v1beta1", + "Kind": "Image", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.RootVolume": { + "io.openshift.machine.v1beta1.LastOperation": { + "description": "LastOperation represents the detail of the last performed operation on the MachineObject.", "type": "object", "properties": { - "availabilityZone": { - "description": "availabilityZone specifies the Cinder availability where the root volume will be created.", - "type": "string" - }, - "deviceType": { - "description": "Deprecated: deviceType will be silently ignored. There is no replacement.", + "description": { + "description": "Description is the human-readable description of the last operation.", "type": "string" }, - "diskSize": { - "description": "diskSize specifies the size, in GB, of the created root volume.", - "type": "integer", - "format": "int32" - }, - "sourceType": { - "description": "Deprecated: sourceType will be silently ignored. There is no replacement.", - "type": "string" + "lastUpdated": { + "description": "LastUpdated is the timestamp at which LastOperation API was last-updated.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "sourceUUID": { - "description": "sourceUUID specifies the UUID of a glance image used to populate the root volume. Deprecated: set image in the platform spec instead. This will be ignored if image is set in the platform spec.", + "state": { + "description": "State is the current status of the last performed operation. E.g. Processing, Failed, Successful etc", "type": "string" }, - "volumeType": { - "description": "volumeType specifies a volume type to use when creating the root volume. If not specified the default volume type will be used.", + "type": { + "description": "Type is the type of operation which was last performed. E.g. Create, Delete, Update etc", "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "RootVolume", + "Version": "v1beta1", + "Kind": "LastOperation", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.SecurityGroupFilter": { + "io.openshift.machine.v1beta1.LifecycleHook": { + "description": "LifecycleHook represents a single instance of a lifecycle hook", "type": "object", + "required": [ + "name", + "owner" + ], "properties": { - "description": { - "description": "description filters security groups by description.", - "type": "string" - }, - "id": { - "description": "id specifies the ID of a security group to use. If set, id will not be validated before use. An invalid id will result in failure to create a server with an appropriate error message.", - "type": "string" - }, - "limit": { - "description": "Deprecated: limit is silently ignored. It has no replacement.", - "type": "integer", - "format": "int32" - }, - "marker": { - "description": "Deprecated: marker is silently ignored. It has no replacement.", - "type": "string" - }, "name": { - "description": "name filters security groups by name.", - "type": "string" - }, - "notTags": { - "description": "notTags filters by security groups which don't match all specified tags. NOT (t1 AND t2...) Multiple tags are comma separated.", - "type": "string" - }, - "notTagsAny": { - "description": "notTagsAny filters by security groups which don't match any specified tags. NOT (t1 OR t2...) Multiple tags are comma separated.", - "type": "string" - }, - "projectId": { - "description": "projectId filters security groups by project ID.", - "type": "string" - }, - "sortDir": { - "description": "Deprecated: sortDir is silently ignored. It has no replacement.", - "type": "string" - }, - "sortKey": { - "description": "Deprecated: sortKey is silently ignored. It has no replacement.", - "type": "string" - }, - "tags": { - "description": "tags filters by security groups containing all specified tags. Multiple tags are comma separated.", - "type": "string" - }, - "tagsAny": { - "description": "tagsAny filters by security groups containing any specified tags. Multiple tags are comma separated.", - "type": "string" + "description": "Name defines a unique name for the lifcycle hook. The name should be unique and descriptive, ideally 1-3 words, in CamelCase or it may be namespaced, eg. foo.example.com/CamelCase. Names must be unique and should only be managed by a single entity.", + "type": "string", + "default": "" }, - "tenantId": { - "description": "tenantId filters security groups by tenant ID. Deprecated: use projectId instead. tenantId will be ignored if projectId is set.", - "type": "string" + "owner": { + "description": "Owner defines the owner of the lifecycle hook. This should be descriptive enough so that users can identify who/what is responsible for blocking the lifecycle. This could be the name of a controller (e.g. clusteroperator/etcd) or an administrator managing the hook.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "SecurityGroupFilter", + "Version": "v1beta1", + "Kind": "LifecycleHook", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.SecurityGroupParam": { + "io.openshift.machine.v1beta1.LifecycleHooks": { + "description": "LifecycleHooks allow users to pause operations on the machine at certain prefedined points within the machine lifecycle.", "type": "object", "properties": { - "filter": { - "description": "Filters used to query security groups in openstack", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.SecurityGroupFilter" + "preDrain": { + "description": "PreDrain hooks prevent the machine from being drained. This also blocks further lifecycle events, such as termination.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.LifecycleHook" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" }, + "preTerminate": { + "description": "PreTerminate hooks prevent the machine from being terminated. PreTerminate hooks be actioned after the Machine has been drained.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.LifecycleHook" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "LifecycleHooks", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.LoadBalancerReference": { + "description": "LoadBalancerReference is a reference to a load balancer on AWS.", + "type": "object", + "required": [ + "name", + "type" + ], + "properties": { "name": { - "description": "Security Group name", - "type": "string" + "type": "string", + "default": "" }, - "uuid": { - "description": "Security Group UUID", - "type": "string" + "type": { + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "SecurityGroupParam", + "Version": "v1beta1", + "Kind": "LoadBalancerReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.SubnetFilter": { + "io.openshift.machine.v1beta1.Machine": { + "description": "Machine is the Schema for the machines API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "properties": { - "cidr": { - "description": "cidr filters subnets by CIDR.", - "type": "string" - }, - "description": { - "description": "description filters subnets by description.", - "type": "string" - }, - "enableDhcp": { - "description": "Deprecated: enableDhcp is silently ignored. It has no replacement.", - "type": "boolean" - }, - "gateway_ip": { - "description": "gateway_ip filters subnets by gateway IP.", - "type": "string" - }, - "id": { - "description": "id is the uuid of a specific subnet to use. If specified, id will not be validated. Instead server creation will fail with an appropriate error.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ipVersion": { - "description": "ipVersion filters subnets by IP version.", - "type": "integer", - "format": "int32" - }, - "ipv6AddressMode": { - "description": "ipv6AddressMode filters subnets by IPv6 address mode.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "ipv6RaMode": { - "description": "ipv6RaMode filters subnets by IPv6 router adversiement mode.", - "type": "string" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "limit": { - "description": "Deprecated: limit is silently ignored. It has no replacement.", - "type": "integer", - "format": "int32" + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSpec" }, - "marker": { - "description": "Deprecated: marker is silently ignored. It has no replacement.", + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "Machine", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.MachineHealthCheck": { + "description": "MachineHealthCheck is the Schema for the machinehealthchecks API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "name": { - "description": "name filters subnets by name.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "networkId": { - "description": "Deprecated: networkId is silently ignored. Set uuid on the containing network definition instead.", - "type": "string" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "notTags": { - "description": "notTags filters by subnets which don't match all specified tags. NOT (t1 AND t2...) Multiple tags are comma separated.", - "type": "string" + "spec": { + "description": "Specification of machine health check policy", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineHealthCheckSpec" }, - "notTagsAny": { - "description": "notTagsAny filters by subnets which don't match any specified tags. NOT (t1 OR t2...) Multiple tags are comma separated.", + "status": { + "description": "Most recently observed status of MachineHealthCheck resource", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineHealthCheckStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "MachineHealthCheck", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.MachineHealthCheckList": { + "description": "MachineHealthCheckList contains a list of MachineHealthCheck Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "projectId": { - "description": "projectId filters subnets by project ID.", - "type": "string" + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineHealthCheck" + } }, - "sortDir": { - "description": "Deprecated: sortDir is silently ignored. It has no replacement.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "sortKey": { - "description": "Deprecated: sortKey is silently ignored. It has no replacement.", - "type": "string" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "MachineHealthCheckList", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.MachineHealthCheckSpec": { + "description": "MachineHealthCheckSpec defines the desired state of MachineHealthCheck", + "type": "object", + "required": [ + "selector", + "unhealthyConditions" + ], + "properties": { + "maxUnhealthy": { + "description": "Any farther remediation is only allowed if at most \"MaxUnhealthy\" machines selected by \"selector\" are not healthy. Expects either a postive integer value or a percentage value. Percentage values must be positive whole numbers and are capped at 100%. Both 0 and 0% are valid and will block all remediation.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" }, - "subnetpoolId": { - "description": "subnetpoolId filters subnets by subnet pool ID.", - "type": "string" + "nodeStartupTimeout": { + "description": "Machines older than this duration without a node will be considered to have failed and will be remediated. To prevent Machines without Nodes from being removed, disable startup checks by setting this value explicitly to \"0\". Expects an unsigned duration string of decimal numbers each with optional fraction and a unit suffix, eg \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "tags": { - "description": "tags filters by subnets containing all specified tags. Multiple tags are comma separated.", - "type": "string" + "remediationTemplate": { + "description": "RemediationTemplate is a reference to a remediation template provided by an infrastructure provider.\n\nThis field is completely optional, when filled, the MachineHealthCheck controller creates a new object from the template referenced and hands off remediation of the machine to a controller that lives outside of Machine API Operator.", + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" }, - "tagsAny": { - "description": "tagsAny filters by subnets containing any specified tags. Multiple tags are comma separated.", - "type": "string" + "selector": { + "description": "Label selector to match machines whose health will be exercised. Note: An empty selector will match all machines.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "tenantId": { - "description": "tenantId filters subnets by tenant ID. Deprecated: use projectId instead. tenantId will be ignored if projectId is set.", - "type": "string" + "unhealthyConditions": { + "description": "UnhealthyConditions contains a list of the conditions that determine whether a node is considered unhealthy. The conditions are combined in a logical OR, i.e. if any of the conditions is met, the node is unhealthy.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.UnhealthyCondition" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "SubnetFilter", + "Version": "v1beta1", + "Kind": "MachineHealthCheckSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1alpha1.SubnetParam": { + "io.openshift.machine.v1beta1.MachineHealthCheckStatus": { + "description": "MachineHealthCheckStatus defines the observed state of MachineHealthCheck", "type": "object", + "required": [ + "expectedMachines", + "currentHealthy" + ], "properties": { - "filter": { - "description": "Filters for optional network query", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1alpha1.SubnetFilter" - }, - "portSecurity": { - "description": "PortSecurity optionally enables or disables security on ports managed by OpenStack", - "type": "boolean" - }, - "portTags": { - "description": "PortTags are tags that are added to ports created on this subnet", + "conditions": { + "description": "Conditions defines the current state of the MachineHealthCheck", "type": "array", "items": { - "type": "string", - "default": "" - } + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "uuid": { - "description": "The UUID of the network. Required if you omit the port attribute.", - "type": "string" + "currentHealthy": { + "description": "total number of machines counted by this machine health check", + "type": "integer", + "format": "int32" + }, + "expectedMachines": { + "description": "total number of machines counted by this machine health check", + "type": "integer", + "format": "int32" + }, + "remediationsAllowed": { + "description": "RemediationsAllowed is the number of further remediations allowed by this machine health check before maxUnhealthy short circuiting will be applied", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", - "Version": "v1alpha1", - "Kind": "SubnetParam", + "Version": "v1beta1", + "Kind": "MachineHealthCheckStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AWSMachineProviderConfig": { - "description": "AWSMachineProviderConfig is the Schema for the awsmachineproviderconfigs API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.MachineList": { + "description": "MachineList contains a list of Machine Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "ami", - "instanceType", - "deviceIndex", - "subnet", - "placement" + "items" ], "properties": { - "ami": { - "description": "AMI is the reference to the AMI from which to create the machine instance.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" - }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "blockDevices": { - "description": "BlockDevices is the set of block device mapping associated to this instance, block device without a name will be used as a root device and only one device without a name is allowed https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html", + "items": { "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.BlockDeviceMappingSpec" + "$ref": "#/definitions/io.openshift.machine.v1beta1.Machine" } }, - "credentialsSecret": { - "description": "CredentialsSecret is a reference to the secret with AWS credentials. Otherwise, defaults to permissions provided by attached IAM role where the actuator is running.", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" - }, - "deviceIndex": { - "description": "DeviceIndex is the index of the device on the instance for the network interface attachment. Defaults to 0.", - "type": "integer", - "format": "int64", - "default": 0 - }, - "iamInstanceProfile": { - "description": "IAMInstanceProfile is a reference to an IAM role to assign to the instance", - "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" - }, - "instanceType": { - "description": "InstanceType is the type of instance to create. Example: m4.xlarge", - "type": "string", - "default": "" - }, - "keyName": { - "description": "KeyName is the name of the KeyPair to use for SSH", - "type": "string" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "loadBalancers": { - "description": "LoadBalancers is the set of load balancers to which the new instance should be added once it is created.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.LoadBalancerReference" - } - }, "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "metadataServiceOptions": { - "description": "MetadataServiceOptions allows users to configure instance metadata service interaction options. If nothing specified, default AWS IMDS settings will be applied. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceMetadataOptionsRequest.html", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MetadataServiceOptions" - }, - "networkInterfaceType": { - "description": "NetworkInterfaceType specifies the type of network interface to be used for the primary network interface. Valid values are \"ENA\", \"EFA\", and omitted, which means no opinion and the platform chooses a good default which may change over time. The current default value is \"ENA\". Please visit https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html to learn more about the AWS Elastic Fabric Adapter interface option.", - "type": "string" - }, - "placement": { - "description": "Placement specifies where to create the instance in AWS", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Placement" - }, - "placementGroupName": { - "description": "PlacementGroupName specifies the name of the placement group in which to launch the instance. The placement group must already be created and may use any placement strategy. When omitted, no placement group is used when creating the EC2 instance.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "MachineList", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.MachineSet": { + "description": "MachineSet ensures that a specified number of machines replicas are running at any given time. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "placementGroupPartition": { - "description": "placementGroupPartition is the partition number within the placement group in which to launch the instance. This must be an integer value between 1 and 7. It is only valid if the placement group, referred in `PlacementGroupName` was created with strategy set to partition.", - "type": "integer", - "format": "int32" - }, - "publicIp": { - "description": "PublicIP specifies whether the instance should get a public IP. If not present, it should use the default of its subnet.", - "type": "boolean" - }, - "securityGroups": { - "description": "SecurityGroups is an array of references to security groups that should be applied to the instance.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" - } - }, - "spotMarketOptions": { - "description": "SpotMarketOptions allows users to configure instances to be run using AWS Spot instances.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.SpotMarketOptions" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "subnet": { - "description": "Subnet is a reference to the subnet to use for this instance", + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "tags": { - "description": "Tags is the set of tags to add to apply to an instance, in addition to the ones added by default by the actuator. These tags are additive. The actuator will ensure these tags are present, but will not remove any other tags that may exist on the instance.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.TagSpecification" - } + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSetSpec" }, - "userDataSecret": { - "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSetStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AWSMachineProviderConfig", + "Kind": "MachineSet", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AWSMachineProviderConfigList": { - "description": "AWSMachineProviderConfigList contains a list of AWSMachineProviderConfig Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.MachineSetList": { + "description": "MachineSetList contains a list of MachineSet Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -36965,7 +40865,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSMachineProviderConfig" + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSet" } }, "kind": { @@ -36973,6 +40873,7 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } @@ -36981,509 +40882,539 @@ "Type": "list", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AWSMachineProviderConfigList", + "Kind": "MachineSetList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AWSMachineProviderStatus": { - "description": "AWSMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains AWS-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.MachineSetSpec": { + "description": "MachineSetSpec defines the desired state of MachineSet", "type": "object", + "required": [ + "selector" + ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "authoritativeAPI": { + "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI and ClusterAPI. When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy. When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy. Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API. Currently the authoritative API determines which controller will manage the resource, this will change in a future release. To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.", "type": "string" }, - "conditions": { - "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - } - }, - "instanceId": { - "description": "InstanceID is the instance ID of the machine created in AWS", + "deletePolicy": { + "description": "DeletePolicy defines the policy used to identify nodes to delete when downscaling. Defaults to \"Random\". Valid values are \"Random, \"Newest\", \"Oldest\"", "type": "string" }, - "instanceState": { - "description": "InstanceState is the state of the AWS instance for this machine", - "type": "string" + "minReadySeconds": { + "description": "MinReadySeconds is the minimum number of seconds for which a newly created machine should be ready. Defaults to 0 (machine will be considered available as soon as it is ready)", + "type": "integer", + "format": "int32" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "replicas": { + "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1.", + "type": "integer", + "format": "int32" + }, + "selector": { + "description": "Selector is a label query over machines that should match the replica count. Label keys and values that must match in order to be controlled by this MachineSet. It must match the machine template's labels. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + }, + "template": { + "description": "Template is the object that describes the machine that will be created if insufficient replicas are detected.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineTemplateSpec" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AWSMachineProviderStatus", + "Kind": "MachineSetSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AWSResourceReference": { - "description": "AWSResourceReference is a reference to a specific AWS resource by ID, ARN, or filters. Only one of ID, ARN or Filters may be specified. Specifying more than one will result in a validation error.", + "io.openshift.machine.v1beta1.MachineSetStatus": { + "description": "MachineSetStatus defines the observed state of MachineSet", "type": "object", + "required": [ + "replicas" + ], "properties": { - "arn": { - "description": "ARN of resource", + "authoritativeAPI": { + "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI, ClusterAPI and Migrating. This value is updated by the migration controller to reflect the authoritative API. Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource. When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.", "type": "string" }, - "filters": { - "description": "Filters is a set of filters used to identify a resource", + "availableReplicas": { + "description": "The number of available replicas (ready for at least minReadySeconds) for this MachineSet.", + "type": "integer", + "format": "int32" + }, + "conditions": { + "description": "Conditions defines the current state of the MachineSet", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Filter" - } + "$ref": "#/definitions/io.openshift.machine.v1beta1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "id": { - "description": "ID of resource", + "errorMessage": { + "type": "string" + }, + "errorReason": { + "description": "In the event that there is a terminal problem reconciling the replicas, both ErrorReason and ErrorMessage will be set. ErrorReason will be populated with a succinct value suitable for machine interpretation, while ErrorMessage will contain a more verbose string suitable for logging and human consumption.\n\nThese fields should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the MachineTemplate's spec or the configuration of the machine controller, and that manual intervention is required. Examples of terminal errors would be invalid combinations of settings in the spec, values that are unsupported by the machine controller, or the responsible machine controller itself being critically misconfigured.\n\nAny transient errors that occur during the reconciliation of Machines can be added as events to the MachineSet object and/or logged in the controller's output.", "type": "string" + }, + "fullyLabeledReplicas": { + "description": "The number of replicas that have labels matching the labels of the machine template of the MachineSet.", + "type": "integer", + "format": "int32" + }, + "observedGeneration": { + "description": "ObservedGeneration reflects the generation of the most recently observed MachineSet.", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "The number of ready replicas for this MachineSet. A machine is considered ready when the node has been created and is \"Ready\".", + "type": "integer", + "format": "int32" + }, + "replicas": { + "description": "Replicas is the most recently observed number of replicas.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "synchronizedGeneration": { + "description": "synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with. This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AWSResourceReference", + "Kind": "MachineSetStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AddressesFromPool": { - "description": "AddressesFromPool is an IPAddressPool that will be used to create IPAddressClaims for fulfillment by an external controller.", + "io.openshift.machine.v1beta1.MachineSpec": { + "description": "MachineSpec defines the desired state of Machine", "type": "object", - "required": [ - "group", - "resource", - "name" - ], "properties": { - "group": { - "description": "group of the IP address pool type known to an external IPAM controller. This should be a fully qualified domain name, for example, externalipam.controller.io.", - "type": "string", - "default": "" + "authoritativeAPI": { + "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI and ClusterAPI. When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy. When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy. Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API. Currently the authoritative API determines which controller will manage the resource, this will change in a future release. To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.", + "type": "string" }, - "name": { - "description": "name of an IP address pool, for example, pool-config-1.", - "type": "string", - "default": "" + "lifecycleHooks": { + "description": "LifecycleHooks allow users to pause operations on the machine at certain predefined points within the machine lifecycle.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.LifecycleHooks" }, - "resource": { - "description": "resource of the IP address pool type known to an external IPAM controller. It is normally the plural form of the resource kind in lowercase, for example, ippools.", - "type": "string", - "default": "" + "metadata": { + "description": "ObjectMeta will autopopulate the Node created. Use this to indicate what labels, annotations, name prefix, etc., should be used when creating the Node.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.ObjectMeta" + }, + "providerID": { + "description": "ProviderID is the identification ID of the machine provided by the provider. This field must match the provider ID as seen on the node object corresponding to this machine. This field is required by higher level consumers of cluster-api. Example use case is cluster autoscaler with cluster-api as provider. Clean-up logic in the autoscaler compares machines to nodes to find out machines at provider which could not get registered as Kubernetes nodes. With cluster-api as a generic out-of-tree provider for autoscaler, this field is required by autoscaler to be able to have a provider view of the list of machines. Another list of nodes is queried from the k8s apiserver and then a comparison is done to find out unregistered machines and are marked for delete. This field will be set by the actuators and consumed by higher level entities like autoscaler that will be interfacing with cluster-api as generic provider.", + "type": "string" + }, + "providerSpec": { + "description": "ProviderSpec details Provider-specific configuration to use during node creation.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.ProviderSpec" + }, + "taints": { + "description": "The list of the taints to be applied to the corresponding Node in additive manner. This list will not overwrite any other taints added to the Node on an ongoing basis by other entities. These taints should be actively reconciled e.g. if you ask the machine controller to apply a taint and then manually remove the taint the machine controller will put it back) but not have the machine controller remove any taints", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Taint" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AddressesFromPool", + "Kind": "MachineSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AzureBootDiagnostics": { - "description": "AzureBootDiagnostics configures the boot diagnostics settings for the virtual machine. This allows you to configure capturing serial output from the virtual machine on boot. This is useful for debugging software based launch issues.", + "io.openshift.machine.v1beta1.MachineStatus": { + "description": "MachineStatus defines the observed state of Machine", "type": "object", - "required": [ - "storageAccountType" - ], "properties": { - "customerManaged": { - "description": "CustomerManaged provides reference to the customer manager storage account.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.AzureCustomerManagedBootDiagnostics" + "addresses": { + "description": "Addresses is a list of addresses assigned to the machine. Queried from cloud provider, if available.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.NodeAddress" + }, + "x-kubernetes-list-type": "atomic" }, - "storageAccountType": { - "description": "StorageAccountType determines if the storage account for storing the diagnostics data should be provisioned by Azure (AzureManaged) or by the customer (CustomerManaged).", - "type": "string", - "default": "" + "authoritativeAPI": { + "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI, ClusterAPI and Migrating. This value is updated by the migration controller to reflect the authoritative API. Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource. When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.", + "type": "string" + }, + "conditions": { + "description": "Conditions defines the current state of the Machine", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" + }, + "errorMessage": { + "description": "ErrorMessage will be set in the event that there is a terminal problem reconciling the Machine and will contain a more verbose string suitable for logging and human consumption.\n\nThis field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the Machine's spec or the configuration of the controller, and that manual intervention is required. Examples of terminal errors would be invalid combinations of settings in the spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured.\n\nAny transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output.", + "type": "string" + }, + "errorReason": { + "description": "ErrorReason will be set in the event that there is a terminal problem reconciling the Machine and will contain a succinct value suitable for machine interpretation.\n\nThis field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the Machine's spec or the configuration of the controller, and that manual intervention is required. Examples of terminal errors would be invalid combinations of settings in the spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured.\n\nAny transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output.", + "type": "string" + }, + "lastOperation": { + "description": "LastOperation describes the last-operation performed by the machine-controller. This API should be useful as a history in terms of the latest operation performed on the specific machine. It should also convey the state of the latest-operation for example if it is still on-going, failed or completed successfully.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.LastOperation" + }, + "lastUpdated": { + "description": "LastUpdated identifies when this status was last observed.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "nodeRef": { + "description": "NodeRef will point to the corresponding Node if it exists.", + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + }, + "phase": { + "description": "Phase represents the current phase of machine actuation. One of: Failed, Provisioning, Provisioned, Running, Deleting", + "type": "string" + }, + "providerStatus": { + "description": "ProviderStatus details a Provider-specific status. It is recommended that providers maintain their own versioned API types that should be serialized/deserialized from this field.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "synchronizedGeneration": { + "description": "synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with. This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AzureBootDiagnostics", + "Kind": "MachineStatus", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "storageAccountType", - "fields-to-discriminateBy": { - "customerManaged": "CustomerManaged" - } - } - ] + } }, - "io.openshift.machine.v1beta1.AzureCustomerManagedBootDiagnostics": { - "description": "AzureCustomerManagedBootDiagnostics provides reference to a customer managed storage account.", + "io.openshift.machine.v1beta1.MachineTemplateSpec": { + "description": "MachineTemplateSpec describes the data needed to create a Machine from a template", "type": "object", - "required": [ - "storageAccountURI" - ], "properties": { - "storageAccountURI": { - "description": "StorageAccountURI is the URI of the customer managed storage account. The URI typically will be `https://\u003cmystorageaccountname\u003e.blob.core.windows.net/` but may differ if you are using Azure DNS zone endpoints. You can find the correct endpoint by looking for the Blob Primary Endpoint in the endpoints tab in the Azure console.", - "type": "string", - "default": "" + "metadata": { + "description": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.ObjectMeta" + }, + "spec": { + "description": "Specification of the desired behavior of the machine. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSpec" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AzureCustomerManagedBootDiagnostics", + "Kind": "MachineTemplateSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AzureDiagnostics": { - "description": "AzureDiagnostics is used to configure the diagnostic settings of the virtual machine.", + "io.openshift.machine.v1beta1.MetadataServiceOptions": { + "description": "MetadataServiceOptions defines the options available to a user when configuring Instance Metadata Service (IMDS) Options.", "type": "object", "properties": { - "boot": { - "description": "AzureBootDiagnostics configures the boot diagnostics settings for the virtual machine. This allows you to configure capturing serial output from the virtual machine on boot. This is useful for debugging software based launch issues.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.AzureBootDiagnostics" + "authentication": { + "description": "Authentication determines whether or not the host requires the use of authentication when interacting with the metadata service. When using authentication, this enforces v2 interaction method (IMDSv2) with the metadata service. When omitted, this means the user has no opinion and the value is left to the platform to choose a good default, which is subject to change over time. The current default is optional. At this point this field represents `HttpTokens` parameter from `InstanceMetadataOptionsRequest` structure in AWS EC2 API https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceMetadataOptionsRequest.html", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AzureDiagnostics", + "Kind": "MetadataServiceOptions", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AzureMachineProviderSpec": { - "description": "AzureMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an Azure virtual machine. It is used by the Azure machine actuator to create a single Machine. Required parameters such as location that are not specified by this configuration, will be defaulted by the actuator. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.NetworkDeviceSpec": { + "description": "NetworkDeviceSpec defines the network configuration for a virtual machine's network device.", "type": "object", - "required": [ - "image", - "osDisk", - "publicIP", - "subnet" - ], "properties": { - "acceleratedNetworking": { - "description": "AcceleratedNetworking enables or disables Azure accelerated networking feature. Set to false by default. If true, then this will depend on whether the requested VMSize is supported. If set to true with an unsupported VMSize, Azure will return an error.", - "type": "boolean" + "addressesFromPools": { + "description": "addressesFromPools is a list of references to IP pool types and instances which are handled by an external controller. addressesFromPool configurations provided via addressesFromPools defer IP address assignment to an external controller. IP addresses provided via ipAddrs, however, are intended to allow explicit assignment of a machine's IP address. If both addressesFromPool and ipAddrs are empty or not defined, DHCP will assign an IP address. If both ipAddrs and addressesFromPools are defined, the IP addresses associated with ipAddrs will be applied first followed by IP addresses from addressesFromPools.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.AddressesFromPool" + } }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "gateway": { + "description": "gateway is an IPv4 or IPv6 address which represents the subnet gateway, for example, 192.168.1.1.", "type": "string" }, - "applicationSecurityGroups": { - "description": "Application Security Groups that need to be attached to the machine's interface. No application security groups will be attached if zero-length.", + "ipAddrs": { + "description": "ipAddrs is a list of one or more IPv4 and/or IPv6 addresses and CIDR to assign to this device, for example, 192.168.1.100/24. IP addresses provided via ipAddrs are intended to allow explicit assignment of a machine's IP address. IP pool configurations provided via addressesFromPool, however, defer IP address assignment to an external controller. If both addressesFromPool and ipAddrs are empty or not defined, DHCP will be used to assign an IP address. If both ipAddrs and addressesFromPools are defined, the IP addresses associated with ipAddrs will be applied first followed by IP addresses from addressesFromPools.", "type": "array", "items": { "type": "string", "default": "" } }, - "availabilitySet": { - "description": "AvailabilitySet specifies the availability set to use for this instance. Availability set should be precreated, before using this field.", - "type": "string" + "nameservers": { + "description": "nameservers is a list of IPv4 and/or IPv6 addresses used as DNS nameservers, for example, 8.8.8.8. a nameserver is not provided by a fulfilled IPAddressClaim. If DHCP is not the source of IP addresses for this network device, nameservers should include a valid nameserver.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "capacityReservationGroupID": { - "description": "capacityReservationGroupID specifies the capacity reservation group resource id that should be used for allocating the virtual machine. The field size should be greater than 0 and the field input must start with '/'. The input for capacityReservationGroupID must be similar to '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/capacityReservationGroups/{capacityReservationGroupName}'. The keys which are used should be among 'subscriptions', 'providers' and 'resourcegroups' followed by valid ID or names respectively.", + "networkName": { + "description": "networkName is the name of the vSphere network or port group to which the network device will be connected, for example, port-group-1. When not provided, the vCenter API will attempt to select a default network. The available networks (port groups) can be listed using `govc ls 'network/*'`", "type": "string" - }, - "credentialsSecret": { - "description": "CredentialsSecret is a reference to the secret with Azure credentials.", - "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" - }, - "dataDisks": { - "description": "DataDisk specifies the parameters that are used to add one or more data disks to the machine.", + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "NetworkDeviceSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.NetworkSpec": { + "description": "NetworkSpec defines the virtual machine's network configuration.", + "type": "object", + "required": [ + "devices" + ], + "properties": { + "devices": { + "description": "Devices defines the virtual machine's network interfaces.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.DataDisk" + "$ref": "#/definitions/io.openshift.machine.v1beta1.NetworkDeviceSpec" } - }, - "diagnostics": { - "description": "Diagnostics configures the diagnostics settings for the virtual machine. This allows you to configure boot diagnostics such as capturing serial output from the virtual machine on boot. This is useful for debugging software based launch issues.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AzureDiagnostics" - }, - "image": { - "description": "Image is the OS image to use to create the instance.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Image" - }, - "internalLoadBalancer": { - "description": "InternalLoadBalancerName to use for this instance", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "location": { - "description": "Location is the region to use to create the instance", - "type": "string" - }, - "managedIdentity": { - "description": "ManagedIdentity to set managed identity name", + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "NetworkSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.machine.v1beta1.OSDisk": { + "type": "object", + "required": [ + "osType", + "managedDisk", + "diskSizeGB" + ], + "properties": { + "cachingType": { + "description": "CachingType specifies the caching requirements. Possible values include: 'None', 'ReadOnly', 'ReadWrite'. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is `None`.", "type": "string" }, - "metadata": { + "diskSettings": { + "description": "DiskSettings describe ephemeral disk settings for the os disk.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskSettings" }, - "natRule": { - "description": "NatRule to set inbound NAT rule of the load balancer", + "diskSizeGB": { + "description": "DiskSizeGB is the size in GB to assign to the data disk.", "type": "integer", - "format": "int64" - }, - "networkResourceGroup": { - "description": "NetworkResourceGroup is the resource group for the virtual machine's network", - "type": "string" + "format": "int32", + "default": 0 }, - "osDisk": { - "description": "OSDisk represents the parameters for creating the OS disk.", + "managedDisk": { + "description": "ManagedDisk specifies the Managed Disk parameters for the OS disk.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.OSDisk" - }, - "publicIP": { - "description": "PublicIP if true a public IP will be used", - "type": "boolean", - "default": false - }, - "publicLoadBalancer": { - "description": "PublicLoadBalancer to use for this instance", - "type": "string" - }, - "resourceGroup": { - "description": "ResourceGroup is the resource group for the virtual machine", - "type": "string" - }, - "securityGroup": { - "description": "Network Security Group that needs to be attached to the machine's interface. No security group will be attached if empty.", - "type": "string" - }, - "securityProfile": { - "description": "SecurityProfile specifies the Security profile settings for a virtual machine.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.SecurityProfile" - }, - "spotVMOptions": { - "description": "SpotVMOptions allows the ability to specify the Machine should use a Spot VM", - "$ref": "#/definitions/io.openshift.machine.v1beta1.SpotVMOptions" - }, - "sshPublicKey": { - "description": "SSHPublicKey is the public key to use to SSH to the virtual machine.", - "type": "string" - }, - "subnet": { - "description": "Subnet to use for this instance", - "type": "string", - "default": "" - }, - "tags": { - "description": "Tags is a list of tags to apply to the machine.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "ultraSSDCapability": { - "description": "UltraSSDCapability enables or disables Azure UltraSSD capability for a virtual machine. This can be used to allow/disallow binding of Azure UltraSSD to the Machine both as Data Disks or via Persistent Volumes. This Azure feature is subject to a specific scope and certain limitations. More informations on this can be found in the official Azure documentation for Ultra Disks: (https://docs.microsoft.com/en-us/azure/virtual-machines/disks-enable-ultra-ssd?tabs=azure-portal#ga-scope-and-limitations).\n\nWhen omitted, if at least one Data Disk of type UltraSSD is specified, the platform will automatically enable the capability. If a Perisistent Volume backed by an UltraSSD is bound to a Pod on the Machine, when this field is ommitted, the platform will *not* automatically enable the capability (unless already enabled by the presence of an UltraSSD as Data Disk). This may manifest in the Pod being stuck in `ContainerCreating` phase. This defaulting behaviour may be subject to change in future.\n\nWhen set to \"Enabled\", if the capability is available for the Machine based on the scope and limitations described above, the capability will be set on the Machine. This will thus allow UltraSSD both as Data Disks and Persistent Volumes. If set to \"Enabled\" when the capability can't be available due to scope and limitations, the Machine will go into \"Failed\" state.\n\nWhen set to \"Disabled\", UltraSSDs will not be allowed either as Data Disks nor as Persistent Volumes. In this case if any UltraSSDs are specified as Data Disks on a Machine, the Machine will go into a \"Failed\" state. If instead any UltraSSDs are backing the volumes (via Persistent Volumes) of any Pods scheduled on a Node which is backed by the Machine, the Pod may get stuck in `ContainerCreating` phase.", - "type": "string" - }, - "userDataSecret": { - "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", - "$ref": "#/definitions/io.k8s.api.core.v1.SecretReference" - }, - "vmSize": { - "description": "VMSize is the size of the VM to create.", - "type": "string" - }, - "vnet": { - "description": "Vnet to set virtual network name", - "type": "string" + "$ref": "#/definitions/io.openshift.machine.v1beta1.OSDiskManagedDiskParameters" }, - "zone": { - "description": "Availability Zone for the virtual machine. If nil, the virtual machine should be deployed to no zone", - "type": "string" + "osType": { + "description": "OSType is the operating system type of the OS disk. Possible values include \"Linux\" and \"Windows\".", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AzureMachineProviderSpec", + "Kind": "OSDisk", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.AzureMachineProviderStatus": { - "description": "AzureMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains Azure-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.OSDiskManagedDiskParameters": { + "description": "OSDiskManagedDiskParameters is the parameters of a OSDisk managed disk.", "type": "object", + "required": [ + "storageAccountType" + ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "conditions": { - "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "diskEncryptionSet": { + "description": "DiskEncryptionSet is the disk encryption set properties", + "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskEncryptionSetParameters" }, - "metadata": { + "securityProfile": { + "description": "securityProfile specifies the security profile for the managed disk.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "vmId": { - "description": "VMID is the ID of the virtual machine created in Azure.", - "type": "string" + "$ref": "#/definitions/io.openshift.machine.v1beta1.VMDiskSecurityProfile" }, - "vmState": { - "description": "VMState is the provisioning state of the Azure virtual machine.", - "type": "string" + "storageAccountType": { + "description": "StorageAccountType is the storage account type to use. Possible values include \"Standard_LRS\", \"Premium_LRS\".", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "AzureMachineProviderStatus", + "Kind": "OSDiskManagedDiskParameters", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.BlockDeviceMappingSpec": { - "description": "BlockDeviceMappingSpec describes a block device mapping", + "io.openshift.machine.v1beta1.ObjectMeta": { + "description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create. This is a copy of customizable fields from metav1.ObjectMeta.\n\nObjectMeta is embedded in `Machine.Spec`, `MachineDeployment.Template` and `MachineSet.Template`, which are not top-level Kubernetes objects. Given that metav1.ObjectMeta has lots of special cases and read-only fields which end up in the generated CRD validation, having it as a subset simplifies the API and some issues that can impact user experience.\n\nDuring the [upgrade to controller-tools@v2](https://github.com/kubernetes-sigs/cluster-api/pull/1054) for v1alpha2, we noticed a failure would occur running Cluster API test suite against the new CRDs, specifically `spec.metadata.creationTimestamp in body must be of type string: \"null\"`. The investigation showed that `controller-tools@v2` behaves differently than its previous version when handling types from [metav1](k8s.io/apimachinery/pkg/apis/meta/v1) package.\n\nIn more details, we found that embedded (non-top level) types that embedded `metav1.ObjectMeta` had validation properties, including for `creationTimestamp` (metav1.Time). The `metav1.Time` type specifies a custom json marshaller that, when IsZero() is true, returns `null` which breaks validation because the field isn't marked as nullable.\n\nIn future versions, controller-tools@v2 might allow overriding the type and validation for embedded types. When that happens, this hack should be revisited.", "type": "object", "properties": { - "deviceName": { - "description": "The device name exposed to the machine (for example, /dev/sdh or xvdh).", + "annotations": { + "description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "generateName": { + "description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency", "type": "string" }, - "ebs": { - "description": "Parameters used to automatically set up EBS volumes when the machine is launched.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.EBSBlockDeviceSpec" + "labels": { + "description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } }, - "noDevice": { - "description": "Suppresses the specified device included in the block device mapping of the AMI.", + "name": { + "description": "Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names", "type": "string" }, - "virtualName": { - "description": "The virtual device name (ephemeralN). Machine store volumes are numbered starting from 0. An machine type with 2 available machine store volumes can specify mappings for ephemeral0 and ephemeral1.The number of available machine store volumes depends on the machine type. After you connect to the machine, you must mount the volume.\n\nConstraints: For M3 machines, you must specify machine store volumes in the block device mapping for the machine. When you launch an M3 machine, we ignore any machine store volumes specified in the block device mapping for the AMI.", + "namespace": { + "description": "Namespace defines the space within each name must be unique. An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.\n\nMust be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces", "type": "string" + }, + "ownerReferences": { + "description": "List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference" + }, + "x-kubernetes-list-map-keys": [ + "uid" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "uid", + "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "BlockDeviceMappingSpec", + "Kind": "ObjectMeta", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.Condition": { - "description": "Condition defines an observation of a Machine API resource operational state.", + "io.openshift.machine.v1beta1.Placement": { + "description": "Placement indicates where to create the instance in AWS", "type": "object", - "required": [ - "type", - "status" - ], "properties": { - "lastTransitionTime": { - "description": "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { - "description": "A human readable message indicating details about the transition. This field may be empty.", + "availabilityZone": { + "description": "AvailabilityZone is the availability zone of the instance", "type": "string" }, - "reason": { - "description": "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", + "region": { + "description": "Region is the region to use to create the instance", "type": "string" }, - "severity": { - "description": "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + "tenancy": { + "description": "Tenancy indicates if instance should run on shared or single-tenant hardware. There are supported 3 options: default, dedicated and host.", "type": "string" - }, - "status": { - "description": "Status of the condition, one of True, False, Unknown.", - "type": "string", - "default": "" - }, - "type": { - "description": "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", - "type": "string", - "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "Condition", + "Kind": "Placement", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.ConfidentialVM": { - "description": "ConfidentialVM defines the UEFI settings for the virtual machine.", + "io.openshift.machine.v1beta1.ProviderSpec": { + "description": "ProviderSpec defines the configuration to use during node creation.", "type": "object", "properties": { - "uefiSettings": { - "description": "uefiSettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.UEFISettings" + "value": { + "description": "Value is an inlined, serialized representation of the resource configuration. It is recommended that providers maintain their own versioned API types that should be serialized/deserialized from this field, akin to component config.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "ConfidentialVM", + "Kind": "ProviderSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.DataDisk": { - "description": "DataDisk specifies the parameters that are used to add one or more data disks to the machine. A Data Disk is a managed disk that's attached to a virtual machine to store application data. It differs from an OS Disk as it doesn't come with a pre-installed OS, and it cannot contain the boot volume. It is registered as SCSI drive and labeled with the chosen `lun`. e.g. for `lun: 0` the raw disk device will be available at `/dev/disk/azure/scsi1/lun0`.\n\nAs the Data Disk disk device is attached raw to the virtual machine, it will need to be partitioned, formatted with a filesystem and mounted, in order for it to be usable. This can be done by creating a custom userdata Secret with custom Ignition configuration to achieve the desired initialization. At this stage the previously defined `lun` is to be used as the \"device\" key for referencing the raw disk device to be initialized. Once the custom userdata Secret has been created, it can be referenced in the Machine's `.providerSpec.userDataSecret`. For further guidance and examples, please refer to the official OpenShift docs.", + "io.openshift.machine.v1beta1.ResourceManagerTag": { + "description": "ResourceManagerTag is a tag to apply to GCP resources created for the cluster.", "type": "object", "required": [ - "nameSuffix", - "diskSizeGB", - "deletionPolicy" + "parentID", + "key", + "value" ], "properties": { - "cachingType": { - "description": "CachingType specifies the caching requirements. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is CachingTypeNone.", - "type": "string" - }, - "deletionPolicy": { - "description": "DeletionPolicy specifies the data disk deletion policy upon Machine deletion. Possible values are \"Delete\",\"Detach\". When \"Delete\" is used the data disk is deleted when the Machine is deleted. When \"Detach\" is used the data disk is detached from the Machine and retained when the Machine is deleted.", + "key": { + "description": "key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty. Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `._-`.", "type": "string", "default": "" }, - "diskSizeGB": { - "description": "DiskSizeGB is the size in GB to assign to the data disk.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "lun": { - "description": "Lun Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM. This value is also needed for referencing the data disks devices within userdata to perform disk initialization through Ignition (e.g. partition/format/mount). The value must be between 0 and 63.", - "type": "integer", - "format": "int32" - }, - "managedDisk": { - "description": "ManagedDisk specifies the Managed Disk parameters for the data disk. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is a ManagedDisk with with storageAccountType: \"Premium_LRS\" and diskEncryptionSet.id: \"Default\".", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.DataDiskManagedDiskParameters" + "parentID": { + "description": "parentID is the ID of the hierarchical resource where the tags are defined e.g. at the Organization or the Project level. To find the Organization or Project ID ref https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects An OrganizationID can have a maximum of 32 characters and must consist of decimal numbers, and cannot have leading zeroes. A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers, and hyphens, and must start with a letter, and cannot end with a hyphen.", + "type": "string", + "default": "" }, - "nameSuffix": { - "description": "NameSuffix is the suffix to be appended to the machine name to generate the disk name. Each disk name will be in format \u003cmachineName\u003e_\u003cnameSuffix\u003e. NameSuffix name must start and finish with an alphanumeric character and can only contain letters, numbers, underscores, periods or hyphens. The overall disk name must not exceed 80 chars in length.", + "value": { + "description": "value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty. Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `_-.@%=+:,*#\u0026(){}[]` and spaces.", "type": "string", "default": "" } @@ -37492,58 +41423,72 @@ "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "DataDisk", + "Kind": "ResourceManagerTag", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.DataDiskManagedDiskParameters": { - "description": "DataDiskManagedDiskParameters is the parameters of a DataDisk managed disk.", + "io.openshift.machine.v1beta1.SecurityProfile": { + "description": "SecurityProfile specifies the Security profile settings for a virtual machine or virtual machine scale set.", "type": "object", - "required": [ - "storageAccountType" - ], "properties": { - "diskEncryptionSet": { - "description": "DiskEncryptionSet is the disk encryption set properties. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is a DiskEncryptionSet with id: \"Default\".", - "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskEncryptionSetParameters" + "encryptionAtHost": { + "description": "encryptionAtHost indicates whether Host Encryption should be enabled or disabled for a virtual machine or virtual machine scale set. This should be disabled when SecurityEncryptionType is set to DiskWithVMGuestState. Default is disabled.", + "type": "boolean" }, - "storageAccountType": { - "description": "StorageAccountType is the storage account type to use. Possible values include \"Standard_LRS\", \"Premium_LRS\" and \"UltraSSD_LRS\".", - "type": "string", - "default": "" + "settings": { + "description": "settings specify the security type and the UEFI settings of the virtual machine. This field can be set for Confidential VMs and Trusted Launch for VMs.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.SecuritySettings" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "DataDiskManagedDiskParameters", + "Kind": "SecurityProfile", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.DiskEncryptionSetParameters": { - "description": "DiskEncryptionSetParameters is the disk encryption set properties", + "io.openshift.machine.v1beta1.SecuritySettings": { + "description": "SecuritySettings define the security type and the UEFI settings of the virtual machine.", "type": "object", "properties": { - "id": { - "description": "ID is the disk encryption set ID Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is: \"Default\".", + "confidentialVM": { + "description": "confidentialVM specifies the security configuration of the virtual machine. For more information regarding Confidential VMs, please refer to: https://learn.microsoft.com/azure/confidential-computing/confidential-vm-overview", + "$ref": "#/definitions/io.openshift.machine.v1beta1.ConfidentialVM" + }, + "securityType": { + "description": "securityType specifies the SecurityType of the virtual machine. It has to be set to any specified value to enable UEFISettings. The default behavior is: UEFISettings will not be enabled unless this property is set.", "type": "string" + }, + "trustedLaunch": { + "description": "trustedLaunch specifies the security configuration of the virtual machine. For more information regarding TrustedLaunch for VMs, please refer to: https://learn.microsoft.com/azure/virtual-machines/trusted-launch", + "$ref": "#/definitions/io.openshift.machine.v1beta1.TrustedLaunch" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "DiskEncryptionSetParameters", + "Kind": "SecuritySettings", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "securityType", + "fields-to-discriminateBy": { + "confidentialVM": "ConfidentialVM", + "trustedLaunch": "TrustedLaunch" + } + } + ] }, - "io.openshift.machine.v1beta1.DiskSettings": { - "description": "DiskSettings describe ephemeral disk settings for the os disk.", + "io.openshift.machine.v1beta1.SpotMarketOptions": { + "description": "SpotMarketOptions defines the options available to a user when configuring Machines to run on Spot instances. Most users should provide an empty struct.", "type": "object", "properties": { - "ephemeralStorageLocation": { - "description": "EphemeralStorageLocation enables ephemeral OS when set to 'Local'. Possible values include: 'Local'. See https://docs.microsoft.com/en-us/azure/virtual-machines/ephemeral-os-disks for full details. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is that disks are saved to remote Azure storage.", + "maxPrice": { + "description": "The maximum price the user is willing to pay for their instances Default: On-Demand price", "type": "string" } }, @@ -37551,148 +41496,82 @@ "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "DiskSettings", + "Kind": "SpotMarketOptions", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.EBSBlockDeviceSpec": { - "description": "EBSBlockDeviceSpec describes a block device for an EBS volume. https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EbsBlockDevice", + "io.openshift.machine.v1beta1.SpotVMOptions": { + "description": "SpotVMOptions defines the options relevant to running the Machine on Spot VMs", "type": "object", "properties": { - "deleteOnTermination": { - "description": "Indicates whether the EBS volume is deleted on machine termination.", - "type": "boolean" - }, - "encrypted": { - "description": "Indicates whether the EBS volume is encrypted. Encrypted Amazon EBS volumes may only be attached to machines that support Amazon EBS encryption.", - "type": "boolean" - }, - "iops": { - "description": "The number of I/O operations per second (IOPS) that the volume supports. For io1, this represents the number of IOPS that are provisioned for the volume. For gp2, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting. For more information about General Purpose SSD baseline performance, I/O credits, and bursting, see Amazon EBS Volume Types (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html) in the Amazon Elastic Compute Cloud User Guide.\n\nMinimal and maximal IOPS for io1 and gp2 are constrained. Please, check https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html for precise boundaries for individual volumes.\n\nCondition: This parameter is required for requests to create io1 volumes; it is not used in requests to create gp2, st1, sc1, or standard volumes.", - "type": "integer", - "format": "int64" - }, - "kmsKey": { - "description": "Indicates the KMS key that should be used to encrypt the Amazon EBS volume.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AWSResourceReference" - }, - "volumeSize": { - "description": "The size of the volume, in GiB.\n\nConstraints: 1-16384 for General Purpose SSD (gp2), 4-16384 for Provisioned IOPS SSD (io1), 500-16384 for Throughput Optimized HDD (st1), 500-16384 for Cold HDD (sc1), and 1-1024 for Magnetic (standard) volumes. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.\n\nDefault: If you're creating the volume from a snapshot and don't specify a volume size, the default is the snapshot size.", - "type": "integer", - "format": "int64" - }, - "volumeType": { - "description": "The volume type: gp2, io1, st1, sc1, or standard. Default: standard", - "type": "string" + "maxPrice": { + "description": "MaxPrice defines the maximum price the user is willing to pay for Spot VM instances", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "EBSBlockDeviceSpec", + "Kind": "SpotVMOptions", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.Filter": { - "description": "Filter is a filter used to identify an AWS resource", + "io.openshift.machine.v1beta1.TagSpecification": { + "description": "TagSpecification is the name/value pair for a tag", "type": "object", "required": [ - "name" + "name", + "value" ], "properties": { "name": { - "description": "Name of the filter. Filter names are case-sensitive.", + "description": "Name of the tag", "type": "string", "default": "" }, - "values": { - "description": "Values includes one or more filter values. Filter values are case-sensitive.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "value": { + "description": "Value of the tag", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "Filter", + "Kind": "TagSpecification", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPDisk": { - "description": "GCPDisk describes disks for GCP.", + "io.openshift.machine.v1beta1.TrustedLaunch": { + "description": "TrustedLaunch defines the UEFI settings for the virtual machine.", "type": "object", - "required": [ - "autoDelete", - "boot", - "sizeGb", - "type", - "image", - "labels" - ], "properties": { - "autoDelete": { - "description": "AutoDelete indicates if the disk will be auto-deleted when the instance is deleted (default false).", - "type": "boolean", - "default": false - }, - "boot": { - "description": "Boot indicates if this is a boot disk (default false).", - "type": "boolean", - "default": false - }, - "encryptionKey": { - "description": "EncryptionKey is the customer-supplied encryption key of the disk.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPEncryptionKeyReference" - }, - "image": { - "description": "Image is the source image to create this disk.", - "type": "string", - "default": "" - }, - "labels": { - "description": "Labels list of labels to apply to the disk.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "sizeGb": { - "description": "SizeGB is the size of the disk (in GB).", - "type": "integer", - "format": "int64", - "default": 0 - }, - "type": { - "description": "Type is the type of the disk (eg: pd-standard).", - "type": "string", - "default": "" + "uefiSettings": { + "description": "uefiSettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.UEFISettings" } }, "x-fabric8-info": { "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "GCPDisk", + "Kind": "TrustedLaunch", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPEncryptionKeyReference": { - "description": "GCPEncryptionKeyReference describes the encryptionKey to use for a disk's encryption.", + "io.openshift.machine.v1beta1.UEFISettings": { + "description": "UEFISettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", "type": "object", "properties": { - "kmsKey": { - "description": "KMSKeyName is the reference KMS key, in the format", - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPKMSKeyReference" + "secureBoot": { + "description": "secureBoot specifies whether secure boot should be enabled on the virtual machine. Secure Boot verifies the digital signature of all boot components and halts the boot process if signature verification fails. If omitted, the platform chooses a default, which is subject to change over time, currently that default is disabled.", + "type": "string" }, - "kmsKeyServiceAccount": { - "description": "KMSKeyServiceAccount is the service account being used for the encryption request for the given KMS key. If absent, the Compute Engine default service account is used. See https://cloud.google.com/compute/docs/access/service-accounts#compute_engine_service_account for details on the default service account.", + "virtualizedTrustedPlatformModule": { + "description": "virtualizedTrustedPlatformModule specifies whether vTPM should be enabled on the virtual machine. When enabled the virtualized trusted platform module measurements are used to create a known good boot integrity policy baseline. The integrity policy baseline is used for comparison with measurements from subsequent VM boots to determine if anything has changed. This is required to be enabled if SecurityEncryptionType is defined. If omitted, the platform chooses a default, which is subject to change over time, currently that default is disabled.", "type": "string" } }, @@ -37700,26 +41579,29 @@ "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "GCPEncryptionKeyReference", + "Kind": "UEFISettings", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPGPUConfig": { - "description": "GCPGPUConfig describes type and count of GPUs attached to the instance on GCP.", + "io.openshift.machine.v1beta1.UnhealthyCondition": { + "description": "UnhealthyCondition represents a Node condition type and value with a timeout specified as a duration. When the named condition has been in the given status for at least the timeout value, a node is considered unhealthy.", "type": "object", "required": [ - "count", - "type" + "type", + "status", + "timeout" ], "properties": { - "count": { - "description": "Count is the number of GPUs to be attached to an instance.", - "type": "integer", - "format": "int32", - "default": 0 + "status": { + "type": "string", + "default": "" + }, + "timeout": { + "description": "Expects an unsigned duration string of decimal numbers each with optional fraction and a unit suffix, eg \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".", + "default": 0, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, "type": { - "description": "Type is the type of GPU to be attached to an instance. Supported GPU types are: nvidia-tesla-k80, nvidia-tesla-p100, nvidia-tesla-v100, nvidia-tesla-p4, nvidia-tesla-t4", "type": "string", "default": "" } @@ -37728,36 +41610,21 @@ "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "GCPGPUConfig", + "Kind": "UnhealthyCondition", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPKMSKeyReference": { - "description": "GCPKMSKeyReference gathers required fields for looking up a GCP KMS Key", + "io.openshift.machine.v1beta1.VMDiskSecurityProfile": { + "description": "VMDiskSecurityProfile specifies the security profile settings for the managed disk. It can be set only for Confidential VMs.", "type": "object", - "required": [ - "name", - "keyRing", - "location" - ], "properties": { - "keyRing": { - "description": "KeyRing is the name of the KMS Key Ring which the KMS Key belongs to.", - "type": "string", - "default": "" - }, - "location": { - "description": "Location is the GCP location in which the Key Ring exists.", - "type": "string", - "default": "" - }, - "name": { - "description": "Name is the name of the customer managed encryption key to be used for the disk encryption.", - "type": "string", - "default": "" + "diskEncryptionSet": { + "description": "diskEncryptionSet specifies the customer managed disk encryption set resource id for the managed disk that is used for Customer Managed Key encrypted ConfidentialVM OS Disk and VMGuest blob.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskEncryptionSetParameters" }, - "projectID": { - "description": "ProjectID is the ID of the Project in which the KMS Key Ring exists. Defaults to the VM ProjectID if not set.", + "securityEncryptionType": { + "description": "securityEncryptionType specifies the encryption type of the managed disk. It is set to DiskWithVMGuestState to encrypt the managed disk along with the VMGuestState blob, and to VMGuestStateOnly to encrypt the VMGuestState blob only. When set to VMGuestStateOnly, the vTPM should be enabled. When set to DiskWithVMGuestState, both SecureBoot and vTPM should be enabled. If the above conditions are not fulfilled, the VM will not be created and the respective error will be returned. It can be set only for Confidential VMs. Confidential VMs are defined by their SecurityProfile.SecurityType being set to ConfidentialVM, the SecurityEncryptionType of their OS disk being set to one of the allowed values and by enabling the respective SecurityProfile.UEFISettings of the VM (i.e. vTPM and SecureBoot), depending on the selected SecurityEncryptionType. For further details on Azure Confidential VMs, please refer to the respective documentation: https://learn.microsoft.com/azure/confidential-computing/confidential-vm-overview", "type": "string" } }, @@ -37765,177 +41632,100 @@ "Type": "nested", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "GCPKMSKeyReference", + "Kind": "VMDiskSecurityProfile", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPMachineProviderSpec": { - "description": "GCPMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an GCP virtual machine. It is used by the GCP machine actuator to create a single Machine. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.VSphereMachineProviderSpec": { + "description": "VSphereMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an VSphere virtual machine. It is used by the vSphere machine actuator to create a single Machine. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "canIPForward", - "deletionProtection", - "serviceAccounts", - "machineType", - "region", - "zone" + "template", + "network" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "canIPForward": { - "description": "CanIPForward Allows this instance to send and receive packets with non-matching destination or source IPs. This is required if you plan to use this instance to forward routes.", - "type": "boolean", - "default": false - }, - "confidentialCompute": { - "description": "confidentialCompute Defines whether the instance should have confidential compute enabled. If enabled OnHostMaintenance is required to be set to \"Terminate\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is false.", + "cloneMode": { + "description": "CloneMode specifies the type of clone operation. The LinkedClone mode is only support for templates that have at least one snapshot. If the template has no snapshots, then CloneMode defaults to FullClone. When LinkedClone mode is enabled the DiskGiB field is ignored as it is not possible to expand disks of linked clones. Defaults to FullClone. When using LinkedClone, if no snapshots exist for the source template, falls back to FullClone.", "type": "string" }, "credentialsSecret": { - "description": "CredentialsSecret is a reference to the secret with GCP credentials.", + "description": "CredentialsSecret is a reference to the secret with vSphere credentials.", "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" }, - "deletionProtection": { - "description": "DeletionProtection whether the resource should be protected against deletion.", - "type": "boolean", - "default": false - }, - "disks": { - "description": "Disks is a list of disks to be attached to the VM.", - "type": "array", - "items": { - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPDisk" - } - }, - "gcpMetadata": { - "description": "Metadata key/value pairs to apply to the VM.", - "type": "array", - "items": { - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPMetadata" - } - }, - "gpus": { - "description": "GPUs is a list of GPUs to be attached to the VM.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPGPUConfig" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "labels": { - "description": "Labels list of labels to apply to the VM.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "diskGiB": { + "description": "DiskGiB is the size of a virtual machine's disk, in GiB. Defaults to the analogue property value in the template from which this machine is cloned. This parameter will be ignored if 'LinkedClone' CloneMode is set.", + "type": "integer", + "format": "int32" }, - "machineType": { - "description": "MachineType is the machine type to use for the VM.", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "memoryMiB": { + "description": "MemoryMiB is the size of a virtual machine's memory, in MiB. Defaults to the analogue property value in the template from which this machine is cloned.", + "type": "integer", + "format": "int64" }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "networkInterfaces": { - "description": "NetworkInterfaces is a list of network interfaces to be attached to the VM.", - "type": "array", - "items": { - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPNetworkInterface" - } - }, - "onHostMaintenance": { - "description": "OnHostMaintenance determines the behavior when a maintenance event occurs that might cause the instance to reboot. This is required to be set to \"Terminate\" if you want to provision machine with attached GPUs. Otherwise, allowed values are \"Migrate\" and \"Terminate\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is \"Migrate\".", - "type": "string" + "network": { + "description": "Network is the network configuration for this machine's VM.", + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1beta1.NetworkSpec" }, - "preemptible": { - "description": "Preemptible indicates if created instance is preemptible.", - "type": "boolean" + "numCPUs": { + "description": "NumCPUs is the number of virtual processors in a virtual machine. Defaults to the analogue property value in the template from which this machine is cloned.", + "type": "integer", + "format": "int32" }, - "projectID": { - "description": "ProjectID is the project in which the GCP machine provider will create the VM.", - "type": "string" + "numCoresPerSocket": { + "description": "NumCPUs is the number of cores among which to distribute CPUs in this virtual machine. Defaults to the analogue property value in the template from which this machine is cloned.", + "type": "integer", + "format": "int32" }, - "region": { - "description": "Region is the region in which the GCP machine provider will create the VM.", + "snapshot": { + "description": "Snapshot is the name of the snapshot from which the VM was cloned", "type": "string", "default": "" }, - "resourceManagerTags": { - "description": "resourceManagerTags is an optional list of tags to apply to the GCP resources created for the cluster. See https://cloud.google.com/resource-manager/docs/tags/tags-overview for information on tagging GCP resources. GCP supports a maximum of 50 tags per resource.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.ResourceManagerTag" - }, - "x-kubernetes-list-map-keys": [ - "key" - ], - "x-kubernetes-list-type": "map" - }, - "restartPolicy": { - "description": "RestartPolicy determines the behavior when an instance crashes or the underlying infrastructure provider stops the instance as part of a maintenance event (default \"Always\"). Cannot be \"Always\" with preemptible instances. Otherwise, allowed values are \"Always\" and \"Never\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is \"Always\". RestartPolicy represents AutomaticRestart in GCP compute api", - "type": "string" - }, - "serviceAccounts": { - "description": "ServiceAccounts is a list of GCP service accounts to be used by the VM.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPServiceAccount" - } - }, - "shieldedInstanceConfig": { - "description": "ShieldedInstanceConfig is the Shielded VM configuration for the VM", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.GCPShieldedInstanceConfig" - }, - "tags": { - "description": "Tags list of network tags to apply to the VM.", + "tagIDs": { + "description": "tagIDs is an optional set of tags to add to an instance. Specified tagIDs must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified.", "type": "array", "items": { "type": "string", "default": "" } }, - "targetPools": { - "description": "TargetPools are used for network TCP/UDP load balancing. A target pool references member instances, an associated legacy HttpHealthCheck resource, and, optionally, a backup target pool", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "template": { + "description": "Template is the name, inventory path, or instance UUID of the template used to clone new machines.", + "type": "string", + "default": "" }, "userDataSecret": { "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" }, - "zone": { - "description": "Zone is the zone in which the GCP machine provider will create the VM.", - "type": "string", - "default": "" + "workspace": { + "description": "Workspace describes the workspace to use for the machine.", + "$ref": "#/definitions/io.openshift.machine.v1beta1.Workspace" } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "GCPMachineProviderSpec", + "Kind": "VSphereMachineProviderSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPMachineProviderStatus": { - "description": "GCPMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains GCP-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machine.v1beta1.VSphereMachineProviderStatus": { + "description": "VSphereMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains VSphere-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", "type": "object", "properties": { "apiVersion": { @@ -37951,310 +41741,653 @@ } }, "instanceId": { - "description": "InstanceID is the ID of the instance in GCP", + "description": "InstanceID is the ID of the instance in VSphere", "type": "string" }, "instanceState": { - "description": "InstanceState is the provisioning state of the GCP Instance.", + "description": "InstanceState is the provisioning state of the VSphere Instance.", "type": "string" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "taskRef": { + "description": "TaskRef is a managed object reference to a Task related to the machine. This value is set automatically at runtime and should not be set or modified by users.", + "type": "string" } }, "x-fabric8-info": { "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", - "Kind": "GCPMachineProviderStatus", + "Kind": "VSphereMachineProviderStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPMetadata": { - "description": "GCPMetadata describes metadata for GCP.", + "io.openshift.machine.v1beta1.Workspace": { + "description": "WorkspaceConfig defines a workspace configuration for the vSphere cloud provider.", + "type": "object", + "properties": { + "datacenter": { + "description": "Datacenter is the datacenter in which VMs are created/located.", + "type": "string" + }, + "datastore": { + "description": "Datastore is the datastore in which VMs are created/located.", + "type": "string" + }, + "folder": { + "description": "Folder is the folder in which VMs are created/located.", + "type": "string" + }, + "resourcePool": { + "description": "ResourcePool is the resource pool in which VMs are created/located.", + "type": "string" + }, + "server": { + "description": "Server is the IP address or FQDN of the vSphere endpoint.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machine.openshift.io", + "Version": "v1beta1", + "Kind": "Workspace", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.CertExpiry": { + "description": "ceryExpiry contains the bundle name and the expiry date", "type": "object", "required": [ - "key", - "value" + "bundle", + "subject" ], "properties": { - "key": { - "description": "Key is the metadata key.", + "bundle": { + "description": "bundle is the name of the bundle in which the subject certificate resides", "type": "string", "default": "" }, - "value": { - "description": "Value is the metadata value.", - "type": "string" + "expiry": { + "description": "expiry is the date after which the certificate will no longer be valid", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "subject": { + "description": "subject is the subject of the certificate", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "GCPMetadata", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "CertExpiry", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPNetworkInterface": { - "description": "GCPNetworkInterface describes network interfaces for GCP", + "io.openshift.machineconfiguration.v1.ContainerRuntimeConfig": { + "description": "ContainerRuntimeConfig describes a customized Container Runtime configuration.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "spec" + ], "properties": { - "network": { - "description": "Network is the network name.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "projectID": { - "description": "ProjectID is the project in which the GCP machine provider will create the VM.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "publicIP": { - "description": "PublicIP indicates if true a public IP will be used", - "type": "boolean" + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "subnetwork": { - "description": "Subnetwork is the subnetwork name.", + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ContainerRuntimeConfigSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ContainerRuntimeConfigStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ContainerRuntimeConfig", + "Scope": "Clustered" + } + }, + "io.openshift.machineconfiguration.v1.ContainerRuntimeConfigCondition": { + "description": "ContainerRuntimeConfigCondition defines the state of the ContainerRuntimeConfig", + "type": "object", + "properties": { + "lastTransitionTime": { + "description": "lastTransitionTime is the time of the last update to the current status object.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "message provides additional information about the current condition. This is only to be consumed by humans.", + "type": "string" + }, + "reason": { + "description": "reason is the reason for the condition's last transition. Reasons are PascalCase", "type": "string" + }, + "status": { + "description": "status of the condition, one of True, False, Unknown.", + "type": "string", + "default": "" + }, + "type": { + "description": "type specifies the state of the operator's reconciliation functionality.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "GCPNetworkInterface", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ContainerRuntimeConfigCondition", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPServiceAccount": { - "description": "GCPServiceAccount describes service accounts for GCP.", + "io.openshift.machineconfiguration.v1.ContainerRuntimeConfigList": { + "description": "ContainerRuntimeConfigList is a list of ContainerRuntimeConfig resources\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "email", - "scopes" + "metadata", + "items" ], "properties": { - "email": { - "description": "Email is the service account email.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "scopes": { - "description": "Scopes list of scopes to be assigned to the service account.", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ContainerRuntimeConfig" } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ContainerRuntimeConfigList", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.ContainerRuntimeConfigSpec": { + "description": "ContainerRuntimeConfigSpec defines the desired state of ContainerRuntimeConfig", + "type": "object", + "properties": { + "containerRuntimeConfig": { + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ContainerRuntimeConfiguration" + }, + "machineConfigPoolSelector": { + "description": "MachineConfigPoolSelector selects which pools the ContainerRuntimeConfig shoud apply to. A nil selector will result in no pools being selected.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "GCPServiceAccount", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ContainerRuntimeConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.GCPShieldedInstanceConfig": { - "description": "GCPShieldedInstanceConfig describes the shielded VM configuration of the instance on GCP. Shielded VM configuration allow users to enable and disable Secure Boot, vTPM, and Integrity Monitoring.", + "io.openshift.machineconfiguration.v1.ContainerRuntimeConfigStatus": { + "description": "ContainerRuntimeConfigStatus defines the observed state of a ContainerRuntimeConfig", "type": "object", "properties": { - "integrityMonitoring": { - "description": "IntegrityMonitoring determines whether the instance should have integrity monitoring that verify the runtime boot integrity. Compares the most recent boot measurements to the integrity policy baseline and return a pair of pass/fail results depending on whether they match or not. If omitted, the platform chooses a default, which is subject to change over time, currently that default is Enabled.", - "type": "string" + "conditions": { + "description": "conditions represents the latest available observations of current state.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ContainerRuntimeConfigCondition" + }, + "x-kubernetes-list-type": "atomic" }, - "secureBoot": { - "description": "SecureBoot Defines whether the instance should have secure boot enabled. Secure Boot verify the digital signature of all boot components, and halting the boot process if signature verification fails. If omitted, the platform chooses a default, which is subject to change over time, currently that default is Disabled.", + "observedGeneration": { + "description": "observedGeneration represents the generation observed by the controller.", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ContainerRuntimeConfigStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.ContainerRuntimeConfiguration": { + "description": "ContainerRuntimeConfiguration defines the tuneables of the container runtime", + "type": "object", + "properties": { + "defaultRuntime": { + "description": "defaultRuntime is the name of the OCI runtime to be used as the default.", "type": "string" }, - "virtualizedTrustedPlatformModule": { - "description": "VirtualizedTrustedPlatformModule enable virtualized trusted platform module measurements to create a known good boot integrity policy baseline. The integrity policy baseline is used for comparison with measurements from subsequent VM boots to determine if anything has changed. This is required to be set to \"Enabled\" if IntegrityMonitoring is enabled. If omitted, the platform chooses a default, which is subject to change over time, currently that default is Enabled.", + "logLevel": { + "description": "logLevel specifies the verbosity of the logs based on the level it is set to. Options are fatal, panic, error, warn, info, and debug.", "type": "string" + }, + "logSizeMax": { + "description": "logSizeMax specifies the Maximum size allowed for the container log file. Negative numbers indicate that no size limit is imposed. If it is positive, it must be \u003e= 8192 to match/exceed conmon's read buffer.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + }, + "overlaySize": { + "description": "overlaySize specifies the maximum size of a container image. This flag can be used to set quota on the size of container images. (default: 10GB)", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + }, + "pidsLimit": { + "description": "pidsLimit specifies the maximum number of processes allowed in a container", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "GCPShieldedInstanceConfig", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ContainerRuntimeConfiguration", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.Image": { - "description": "Image is a mirror of azure sdk compute.ImageReference", + "io.openshift.machineconfiguration.v1.ControllerCertificate": { + "description": "ControllerCertificate contains info about a specific cert.", "type": "object", "required": [ - "publisher", - "offer", - "sku", - "version", - "resourceID" + "subject", + "signer", + "bundleFile" ], "properties": { - "offer": { - "description": "Offer specifies the name of a group of related images created by the publisher. For example, UbuntuServer, WindowsServer", + "bundleFile": { + "description": "bundleFile is the larger bundle a cert comes from", "type": "string", "default": "" }, - "publisher": { - "description": "Publisher is the name of the organization that created the image", - "type": "string", - "default": "" + "notAfter": { + "description": "notAfter is the upper boundary for validity", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "resourceID": { - "description": "ResourceID specifies an image to use by ID", - "type": "string", - "default": "" + "notBefore": { + "description": "notBefore is the lower boundary for validity", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "sku": { - "description": "SKU specifies an instance of an offer, such as a major release of a distribution. For example, 18.04-LTS, 2019-Datacenter", + "signer": { + "description": "signer is the cert Issuer", "type": "string", "default": "" }, - "type": { - "description": "Type identifies the source of the image and related information, such as purchase plans. Valid values are \"ID\", \"MarketplaceWithPlan\", \"MarketplaceNoPlan\", and omitted, which means no opinion and the platform chooses a good default which may change over time. Currently that default is \"MarketplaceNoPlan\" if publisher data is supplied, or \"ID\" if not. For more information about purchase plans, see: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/cli-ps-findimage#check-the-purchase-plan-information", - "type": "string" - }, - "version": { - "description": "Version specifies the version of an image sku. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal numbers. Specify 'latest' to use the latest version of an image available at deploy time. Even if you use 'latest', the VM image will not automatically update after deploy time even if a new version becomes available.", + "subject": { + "description": "subject is the cert subject", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "Image", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ControllerCertificate", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.LastOperation": { - "description": "LastOperation represents the detail of the last performed operation on the MachineObject.", + "io.openshift.machineconfiguration.v1.ControllerConfig": { + "description": "ControllerConfig describes configuration for MachineConfigController. This is currently only used to drive the MachineConfig objects generated by the TemplateController.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "spec" + ], "properties": { - "description": { - "description": "Description is the human-readable description of the last operation.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "lastUpdated": { - "description": "LastUpdated is the timestamp at which LastOperation API was last-updated.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "state": { - "description": "State is the current status of the last performed operation. E.g. Processing, Failed, Successful etc", + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ControllerConfigSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ControllerConfigStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ControllerConfig", + "Scope": "Clustered" + } + }, + "io.openshift.machineconfiguration.v1.ControllerConfigList": { + "description": "ControllerConfigList is a list of ControllerConfig resources\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "type": { - "description": "Type is the type of operation which was last performed. E.g. Create, Delete, Update etc", + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ControllerConfig" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "LastOperation", + "Type": "list", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ControllerConfigList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.LifecycleHook": { - "description": "LifecycleHook represents a single instance of a lifecycle hook", + "io.openshift.machineconfiguration.v1.ControllerConfigSpec": { + "description": "ControllerConfigSpec is the spec for ControllerConfig resource.", "type": "object", "required": [ - "name", - "owner" + "clusterDNSIP", + "cloudProviderConfig", + "kubeAPIServerServingCAData", + "rootCAData", + "cloudProviderCAData", + "additionalTrustBundle", + "images", + "baseOSContainerImage", + "releaseImage", + "proxy", + "infra", + "dns", + "ipFamilies", + "network" ], "properties": { - "name": { - "description": "Name defines a unique name for the lifcycle hook. The name should be unique and descriptive, ideally 1-3 words, in CamelCase or it may be namespaced, eg. foo.example.com/CamelCase. Names must be unique and should only be managed by a single entity.", + "additionalTrustBundle": { + "description": "additionalTrustBundle is a certificate bundle that will be added to the nodes trusted certificate store.", + "type": "string", + "format": "byte" + }, + "baseOSContainerImage": { + "description": "BaseOSContainerImage is the new-format container image for operating system updates.", "type": "string", "default": "" }, - "owner": { - "description": "Owner defines the owner of the lifecycle hook. This should be descriptive enough so that users can identify who/what is responsible for blocking the lifecycle. This could be the name of a controller (e.g. clusteroperator/etcd) or an administrator managing the hook.", + "baseOSExtensionsContainerImage": { + "description": "BaseOSExtensionsContainerImage is the matching extensions container for the new-format container", + "type": "string", + "default": "" + }, + "cloudProviderCAData": { + "description": "cloudProvider specifies the cloud provider CA data", + "type": "string", + "format": "byte" + }, + "cloudProviderConfig": { + "description": "cloudProviderConfig is the configuration for the given cloud provider", + "type": "string", + "default": "" + }, + "clusterDNSIP": { + "description": "clusterDNSIP is the cluster DNS IP address", + "type": "string", + "default": "" + }, + "dns": { + "description": "dns holds the cluster dns details", + "$ref": "#/definitions/io.openshift.config.v1.DNS" + }, + "etcdDiscoveryDomain": { + "description": "etcdDiscoveryDomain is deprecated, use Infra.Status.EtcdDiscoveryDomain instead", + "type": "string" + }, + "imageRegistryBundleData": { + "description": "imageRegistryBundleData is the ImageRegistryData", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ImageRegistryBundle" + }, + "x-kubernetes-list-type": "atomic" + }, + "imageRegistryBundleUserData": { + "description": "imageRegistryBundleUserData is Image Registry Data provided by the user", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ImageRegistryBundle" + }, + "x-kubernetes-list-type": "atomic" + }, + "images": { + "description": "images is map of images that are used by the controller to render templates under ./templates/", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "infra": { + "description": "infra holds the infrastructure details", + "$ref": "#/definitions/io.openshift.config.v1.Infrastructure" + }, + "internalRegistryPullSecret": { + "description": "internalRegistryPullSecret is the pull secret for the internal registry, used by rpm-ostree to pull images from the internal registry if present", + "type": "string", + "format": "byte" + }, + "ipFamilies": { + "description": "ipFamilies indicates the IP families in use by the cluster network", + "type": "string", + "default": "" + }, + "kubeAPIServerServingCAData": { + "description": "kubeAPIServerServingCAData managed Kubelet to API Server Cert... Rotated automatically", + "type": "string", + "format": "byte" + }, + "network": { + "description": "Network contains additional network related information", + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.NetworkInfo" + }, + "networkType": { + "description": "networkType holds the type of network the cluster is using XXX: this is temporary and will be dropped as soon as possible in favor of a better support to start network related services the proper way. Nobody is also changing this once the cluster is up and running the first time, so, disallow regeneration if this changes.", + "type": "string" + }, + "osImageURL": { + "description": "OSImageURL is the old-format container image that contains the OS update payload.", + "type": "string", + "default": "" + }, + "platform": { + "description": "platform is deprecated, use Infra.Status.PlatformStatus.Type instead", + "type": "string" + }, + "proxy": { + "description": "proxy holds the current proxy configuration for the nodes", + "$ref": "#/definitions/io.openshift.config.v1.ProxyStatus" + }, + "pullSecret": { + "description": "pullSecret is the default pull secret that needs to be installed on all machines.", + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + }, + "releaseImage": { + "description": "releaseImage is the image used when installing the cluster", "type": "string", "default": "" + }, + "rootCAData": { + "description": "rootCAData specifies the root CA data", + "type": "string", + "format": "byte" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "LifecycleHook", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ControllerConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.LifecycleHooks": { - "description": "LifecycleHooks allow users to pause operations on the machine at certain prefedined points within the machine lifecycle.", + "io.openshift.machineconfiguration.v1.ControllerConfigStatus": { + "description": "ControllerConfigStatus is the status for ControllerConfig", "type": "object", "properties": { - "preDrain": { - "description": "PreDrain hooks prevent the machine from being drained. This also blocks further lifecycle events, such as termination.", + "conditions": { + "description": "conditions represents the latest available observations of current state.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.LifecycleHook" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ControllerConfigStatusCondition" }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "x-kubernetes-list-type": "atomic" }, - "preTerminate": { - "description": "PreTerminate hooks prevent the machine from being terminated. PreTerminate hooks be actioned after the Machine has been drained.", + "controllerCertificates": { + "description": "controllerCertificates represents the latest available observations of the automatically rotating certificates in the MCO.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.LifecycleHook" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.ControllerCertificate" }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "x-kubernetes-list-type": "atomic" + }, + "observedGeneration": { + "description": "observedGeneration represents the generation observed by the controller.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "LifecycleHooks", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ControllerConfigStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.LoadBalancerReference": { - "description": "LoadBalancerReference is a reference to a load balancer on AWS.", + "io.openshift.machineconfiguration.v1.ControllerConfigStatusCondition": { + "description": "ControllerConfigStatusCondition contains condition information for ControllerConfigStatus", "type": "object", "required": [ - "name", - "type" + "type", + "status", + "lastTransitionTime" ], "properties": { - "name": { + "lastTransitionTime": { + "description": "lastTransitionTime is the time of the last update to the current status object.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "message provides additional information about the current condition. This is only to be consumed by humans.", + "type": "string" + }, + "reason": { + "description": "reason is the reason for the condition's last transition. Reasons are PascalCase", + "type": "string" + }, + "status": { + "description": "status of the condition, one of True, False, Unknown.", "type": "string", "default": "" }, "type": { + "description": "type specifies the state of the operator's reconciliation functionality.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "LoadBalancerReference", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ControllerConfigStatusCondition", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.Machine": { - "description": "Machine is the Schema for the machines API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1.ImageRegistryBundle": { + "description": "ImageRegistryBundle contains information for writing image registry certificates", + "type": "object", + "required": [ + "file", + "data" + ], + "properties": { + "data": { + "description": "data holds the contents of the bundle that will be written to the file location", + "type": "string", + "format": "byte" + }, + "file": { + "description": "file holds the name of the file where the bundle will be written to disk", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "ImageRegistryBundle", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.KubeletConfig": { + "description": "KubeletConfig describes a customized Kubelet configuration.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "spec" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -38265,67 +42398,67 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSpec" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.KubeletConfigSpec" }, "status": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineStatus" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.KubeletConfigStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "Machine", - "Scope": "Namespaced" + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "KubeletConfig", + "Scope": "Clustered" } }, - "io.openshift.machine.v1beta1.MachineHealthCheck": { - "description": "MachineHealthCheck is the Schema for the machinehealthchecks API Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1.KubeletConfigCondition": { + "description": "KubeletConfigCondition defines the state of the KubeletConfig", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "lastTransitionTime": { + "description": "lastTransitionTime is the time of the last update to the current status object.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "message": { + "description": "message provides additional information about the current condition. This is only to be consumed by humans.", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "Specification of machine health check policy", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineHealthCheckSpec" + "reason": { + "description": "reason is the reason for the condition's last transition. Reasons are PascalCase", + "type": "string" }, "status": { - "description": "Most recently observed status of MachineHealthCheck resource", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineHealthCheckStatus" + "description": "status of the condition, one of True, False, Unknown.", + "type": "string", + "default": "" + }, + "type": { + "description": "type specifies the state of the operator's reconciliation functionality.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineHealthCheck", + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "KubeletConfigCondition", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineHealthCheckList": { - "description": "MachineHealthCheckList contains a list of MachineHealthCheck Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1.KubeletConfigList": { + "description": "KubeletConfigList is a list of KubeletConfig resources\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -38337,7 +42470,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineHealthCheck" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.KubeletConfig" } }, "kind": { @@ -38345,110 +42478,110 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { "Type": "list", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineHealthCheckList", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "KubeletConfigList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineHealthCheckSpec": { - "description": "MachineHealthCheckSpec defines the desired state of MachineHealthCheck", + "io.openshift.machineconfiguration.v1.KubeletConfigSpec": { + "description": "KubeletConfigSpec defines the desired state of KubeletConfig", "type": "object", - "required": [ - "selector", - "unhealthyConditions" - ], "properties": { - "maxUnhealthy": { - "description": "Any farther remediation is only allowed if at most \"MaxUnhealthy\" machines selected by \"selector\" are not healthy. Expects either a postive integer value or a percentage value. Percentage values must be positive whole numbers and are capped at 100%. Both 0 and 0% are valid and will block all remediation.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" + "autoSizingReserved": { + "type": "boolean" }, - "nodeStartupTimeout": { - "description": "Machines older than this duration without a node will be considered to have failed and will be remediated. To prevent Machines without Nodes from being removed, disable startup checks by setting this value explicitly to \"0\". Expects an unsigned duration string of decimal numbers each with optional fraction and a unit suffix, eg \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "kubeletConfig": { + "description": "kubeletConfig fields are defined in kubernetes upstream. Please refer to the types defined in the version/commit used by OpenShift of the upstream kubernetes. It's important to note that, since the fields of the kubelet configuration are directly fetched from upstream the validation of those values is handled directly by the kubelet. Please refer to the upstream version of the relevant kubernetes for the valid values of these fields. Invalid values of the kubelet configuration fields may render cluster nodes unusable.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "remediationTemplate": { - "description": "RemediationTemplate is a reference to a remediation template provided by an infrastructure provider.\n\nThis field is completely optional, when filled, the MachineHealthCheck controller creates a new object from the template referenced and hands off remediation of the machine to a controller that lives outside of Machine API Operator.", - "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + "logLevel": { + "type": "integer", + "format": "int32" }, - "selector": { - "description": "Label selector to match machines whose health will be exercised. Note: An empty selector will match all machines.", - "default": {}, + "machineConfigPoolSelector": { + "description": "MachineConfigPoolSelector selects which pools the KubeletConfig shoud apply to. A nil selector will result in no pools being selected.", "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "unhealthyConditions": { - "description": "UnhealthyConditions contains a list of the conditions that determine whether a node is considered unhealthy. The conditions are combined in a logical OR, i.e. if any of the conditions is met, the node is unhealthy.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.UnhealthyCondition" - } + "tlsSecurityProfile": { + "description": "If unset, the default is based on the apiservers.config.openshift.io/cluster resource. Note that only Old and Intermediate profiles are currently supported, and the maximum available minTLSVersion is VersionTLS12.", + "$ref": "#/definitions/io.openshift.config.v1.TLSSecurityProfile" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineHealthCheckSpec", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "KubeletConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineHealthCheckStatus": { - "description": "MachineHealthCheckStatus defines the observed state of MachineHealthCheck", + "io.openshift.machineconfiguration.v1.KubeletConfigStatus": { + "description": "KubeletConfigStatus defines the observed state of a KubeletConfig", "type": "object", - "required": [ - "expectedMachines", - "currentHealthy" - ], "properties": { "conditions": { - "description": "Conditions defines the current state of the MachineHealthCheck", + "description": "conditions represents the latest available observations of current state.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "currentHealthy": { - "description": "total number of machines counted by this machine health check", - "type": "integer", - "format": "int32" - }, - "expectedMachines": { - "description": "total number of machines counted by this machine health check", - "type": "integer", - "format": "int32" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.KubeletConfigCondition" + } }, - "remediationsAllowed": { - "description": "RemediationsAllowed is the number of further remediations allowed by this machine health check before maxUnhealthy short circuiting will be applied", + "observedGeneration": { + "description": "observedGeneration represents the generation observed by the controller.", "type": "integer", - "format": "int32", - "default": 0 + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineHealthCheckStatus", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "KubeletConfigStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineList": { - "description": "MachineList contains a list of Machine Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1.MachineConfig": { + "description": "MachineConfig defines the configuration for a machine\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigSpec" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfig", + "Scope": "Clustered" + } + }, + "io.openshift.machineconfiguration.v1.MachineConfigList": { + "description": "MachineConfigList is a list of MachineConfig resources\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -38460,7 +42593,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Machine" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfig" } }, "kind": { @@ -38468,22 +42601,24 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { "Type": "list", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineList", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineSet": { - "description": "MachineSet ensures that a specified number of machines replicas are running at any given time. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1.MachineConfigPool": { + "description": "MachineConfigPool describes a pool of MachineConfigs.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "spec" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -38494,31 +42629,69 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSetSpec" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigPoolSpec" }, "status": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSetStatus" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigPoolStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineSet", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigPool", + "Scope": "Clustered" + } + }, + "io.openshift.machineconfiguration.v1.MachineConfigPoolCondition": { + "description": "MachineConfigPoolCondition contains condition information for an MachineConfigPool.", + "type": "object", + "properties": { + "lastTransitionTime": { + "description": "lastTransitionTime is the timestamp corresponding to the last status change of this condition.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "message is a human readable description of the details of the last transition, complementing reason.", + "type": "string", + "default": "" + }, + "reason": { + "description": "reason is a brief machine readable explanation for the condition's last transition.", + "type": "string", + "default": "" + }, + "status": { + "description": "status of the condition, one of ('True', 'False', 'Unknown').", + "type": "string", + "default": "" + }, + "type": { + "description": "type of the condition, currently ('Done', 'Updating', 'Failed').", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigPoolCondition", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineSetList": { - "description": "MachineSetList contains a list of MachineSet Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1.MachineConfigPoolList": { + "description": "MachineConfigPoolList is a list of MachineConfigPool resources\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -38530,7 +42703,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSet" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigPool" } }, "kind": { @@ -38538,983 +42711,1171 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { "Type": "list", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineSetList", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigPoolList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineSetSpec": { - "description": "MachineSetSpec defines the desired state of MachineSet", + "io.openshift.machineconfiguration.v1.MachineConfigPoolSpec": { + "description": "MachineConfigPoolSpec is the spec for MachineConfigPool resource.", "type": "object", - "required": [ - "selector" - ], "properties": { - "authoritativeAPI": { - "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI and ClusterAPI. When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy. When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy. Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API. Currently the authoritative API determines which controller will manage the resource, this will change in a future release. To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.", - "type": "string" - }, - "deletePolicy": { - "description": "DeletePolicy defines the policy used to identify nodes to delete when downscaling. Defaults to \"Random\". Valid values are \"Random, \"Newest\", \"Oldest\"", - "type": "string" + "configuration": { + "description": "The targeted MachineConfig object for the machine config pool.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigPoolStatusConfiguration" }, - "minReadySeconds": { - "description": "MinReadySeconds is the minimum number of seconds for which a newly created machine should be ready. Defaults to 0 (machine will be considered available as soon as it is ready)", - "type": "integer", - "format": "int32" + "machineConfigSelector": { + "description": "machineConfigSelector specifies a label selector for MachineConfigs. Refer https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ on how label and selectors work.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "replicas": { - "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1.", - "type": "integer", - "format": "int32" + "maxUnavailable": { + "description": "maxUnavailable defines either an integer number or percentage of nodes in the pool that can go Unavailable during an update. This includes nodes Unavailable for any reason, including user initiated cordons, failing nodes, etc. The default value is 1.\n\nA value larger than 1 will mean multiple nodes going unavailable during the update, which may affect your workload stress on the remaining nodes. You cannot set this value to 0 to stop updates (it will default back to 1); to stop updates, use the 'paused' property instead. Drain will respect Pod Disruption Budgets (PDBs) such as etcd quorum guards, even if maxUnavailable is greater than one.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" }, - "selector": { - "description": "Selector is a label query over machines that should match the replica count. Label keys and values that must match in order to be controlled by this MachineSet. It must match the machine template's labels. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors", - "default": {}, + "nodeSelector": { + "description": "nodeSelector specifies a label selector for Machines", "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "template": { - "description": "Template is the object that describes the machine that will be created if insufficient replicas are detected.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineTemplateSpec" + "paused": { + "description": "paused specifies whether or not changes to this machine config pool should be stopped. This includes generating new desiredMachineConfig and update of machines.", + "type": "boolean", + "default": false + }, + "pinnedImageSets": { + "description": "pinnedImageSets specifies a sequence of PinnedImageSetRef objects for the pool. Nodes within this pool will preload and pin images defined in the PinnedImageSet. Before pulling images the MachineConfigDaemon will ensure the total uncompressed size of all the images does not exceed available resources. If the total size of the images exceeds the available resources the controller will report a Degraded status to the MachineConfigPool and not attempt to pull any images. Also to help ensure the kubelet can mitigate storage risk, the pinned_image configuration and subsequent service reload will happen only after all of the images have been pulled for each set. Images from multiple PinnedImageSets are loaded and pinned sequentially as listed. Duplicate and existing images will be skipped.\n\nAny failure to prefetch or pin images will result in a Degraded pool. Resolving these failures is the responsibility of the user. The admin should be proactive in ensuring adequate storage and proper image authentication exists in advance.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.PinnedImageSetRef" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineSetSpec", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigPoolSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineSetStatus": { - "description": "MachineSetStatus defines the observed state of MachineSet", + "io.openshift.machineconfiguration.v1.MachineConfigPoolStatus": { + "description": "MachineConfigPoolStatus is the status for MachineConfigPool resource.", "type": "object", - "required": [ - "replicas" - ], "properties": { - "authoritativeAPI": { - "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI, ClusterAPI and Migrating. This value is updated by the migration controller to reflect the authoritative API. Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource. When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.", - "type": "string" + "certExpirys": { + "description": "certExpirys keeps track of important certificate expiration data", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.CertExpiry" + }, + "x-kubernetes-list-type": "atomic" }, - "availableReplicas": { - "description": "The number of available replicas (ready for at least minReadySeconds) for this MachineSet.", + "conditions": { + "description": "conditions represents the latest available observations of current state.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigPoolCondition" + }, + "x-kubernetes-list-type": "atomic" + }, + "configuration": { + "description": "configuration represents the current MachineConfig object for the machine config pool.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.MachineConfigPoolStatusConfiguration" + }, + "degradedMachineCount": { + "description": "degradedMachineCount represents the total number of machines marked degraded (or unreconcilable). A node is marked degraded if applying a configuration failed..", "type": "integer", - "format": "int32" + "format": "int32", + "default": 0 }, - "conditions": { - "description": "Conditions defines the current state of the MachineSet", + "machineCount": { + "description": "machineCount represents the total number of machines in the machine config pool.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "observedGeneration": { + "description": "observedGeneration represents the generation observed by the controller.", + "type": "integer", + "format": "int64" + }, + "poolSynchronizersStatus": { + "description": "poolSynchronizersStatus is the status of the machines managed by the pool synchronizers.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Condition" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1.PoolSynchronizerStatus" }, "x-kubernetes-list-map-keys": [ - "type" + "poolSynchronizerType" ], "x-kubernetes-list-type": "map" }, - "errorMessage": { + "readyMachineCount": { + "description": "readyMachineCount represents the total number of ready machines targeted by the pool.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "unavailableMachineCount": { + "description": "unavailableMachineCount represents the total number of unavailable (non-ready) machines targeted by the pool. A node is marked unavailable if it is in updating state or NodeReady condition is false.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "updatedMachineCount": { + "description": "updatedMachineCount represents the total number of machines targeted by the pool that have the CurrentMachineConfig as their config.", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigPoolStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.MachineConfigPoolStatusConfiguration": { + "description": "MachineConfigPoolStatusConfiguration stores the current configuration for the pool, and optionally also stores the list of MachineConfig objects used to generate the configuration.", + "type": "object", + "properties": { + "apiVersion": { + "description": "API version of the referent.", "type": "string" }, - "errorReason": { - "description": "In the event that there is a terminal problem reconciling the replicas, both ErrorReason and ErrorMessage will be set. ErrorReason will be populated with a succinct value suitable for machine interpretation, while ErrorMessage will contain a more verbose string suitable for logging and human consumption.\n\nThese fields should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the MachineTemplate's spec or the configuration of the machine controller, and that manual intervention is required. Examples of terminal errors would be invalid combinations of settings in the spec, values that are unsupported by the machine controller, or the responsible machine controller itself being critically misconfigured.\n\nAny transient errors that occur during the reconciliation of Machines can be added as events to the MachineSet object and/or logged in the controller's output.", + "fieldPath": { + "description": "If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: \"spec.containers{name}\" (where \"name\" refers to the name of the container that triggered the event) or if no container name is specified \"spec.containers[2]\" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object.", + "type": "string" + }, + "kind": { + "description": "Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "name": { + "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names", + "type": "string" + }, + "namespace": { + "description": "Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/", + "type": "string" + }, + "resourceVersion": { + "description": "Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency", "type": "string" }, - "fullyLabeledReplicas": { - "description": "The number of replicas that have labels matching the labels of the machine template of the MachineSet.", + "source": { + "description": "source is the list of MachineConfig objects that were used to generate the single MachineConfig object specified in `content`.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + }, + "x-kubernetes-list-type": "atomic" + }, + "uid": { + "description": "UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigPoolStatusConfiguration", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.MachineConfigSpec": { + "description": "MachineConfigSpec is the spec for MachineConfig", + "type": "object", + "properties": { + "baseOSExtensionsContainerImage": { + "description": "BaseOSExtensionsContainerImage specifies the remote location that will be used to fetch the extensions container matching a new-format OS image", + "type": "string", + "default": "" + }, + "config": { + "description": "Config is a Ignition Config object.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "extensions": { + "description": "extensions contains a list of additional features that can be enabled on host", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "fips": { + "description": "fips controls FIPS mode", + "type": "boolean", + "default": false + }, + "kernelArguments": { + "description": "kernelArguments contains a list of kernel arguments to be added", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "kernelType": { + "description": "kernelType contains which kernel we want to be running like default (traditional), realtime, 64k-pages (aarch64 only).", + "type": "string", + "default": "" + }, + "osImageURL": { + "description": "OSImageURL specifies the remote location that will be used to fetch the OS.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "MachineConfigSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.NetworkInfo": { + "description": "Network contains network related configuration", + "type": "object", + "required": [ + "mtuMigration" + ], + "properties": { + "mtuMigration": { + "description": "MTUMigration contains the MTU migration configuration.", + "$ref": "#/definitions/io.openshift.config.v1.MTUMigration" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "NetworkInfo", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.PinnedImageSetRef": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name is a reference to the name of a PinnedImageSet. Must adhere to RFC-1123 (https://tools.ietf.org/html/rfc1123). Made up of one of more period-separated (.) segments, where each segment consists of alphanumeric characters and hyphens (-), must begin and end with an alphanumeric character, and is at most 63 characters in length. The total length of the name must not exceed 253 characters.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "PinnedImageSetRef", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1.PoolSynchronizerStatus": { + "type": "object", + "required": [ + "poolSynchronizerType", + "machineCount", + "updatedMachineCount", + "readyMachineCount", + "availableMachineCount", + "unavailableMachineCount" + ], + "properties": { + "availableMachineCount": { + "description": "availableMachineCount is the number of machines managed by the node synchronizer which are available.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "machineCount": { + "description": "machineCount is the number of machines that are managed by the node synchronizer.", "type": "integer", - "format": "int32" + "format": "int64", + "default": 0 }, "observedGeneration": { - "description": "ObservedGeneration reflects the generation of the most recently observed MachineSet.", + "description": "observedGeneration is the last generation change that has been applied.", "type": "integer", "format": "int64" }, - "readyReplicas": { - "description": "The number of ready replicas for this MachineSet. A machine is considered ready when the node has been created and is \"Ready\".", + "poolSynchronizerType": { + "description": "poolSynchronizerType describes the type of the pool synchronizer.", + "type": "string", + "default": "" + }, + "readyMachineCount": { + "description": "readyMachineCount is the number of machines managed by the node synchronizer that are in a ready state.", "type": "integer", - "format": "int32" + "format": "int64", + "default": 0 }, - "replicas": { - "description": "Replicas is the most recently observed number of replicas.", + "unavailableMachineCount": { + "description": "unavailableMachineCount is the number of machines managed by the node synchronizer but are unavailable.", "type": "integer", - "format": "int32", + "format": "int64", "default": 0 }, - "synchronizedGeneration": { - "description": "synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with. This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.", + "updatedMachineCount": { + "description": "updatedMachineCount is the number of machines that have been updated by the node synchronizer.", "type": "integer", - "format": "int64" + "format": "int64", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineSetStatus", + "Group": "machineconfiguration.openshift.io", + "Version": "v1", + "Kind": "PoolSynchronizerStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineSpec": { - "description": "MachineSpec defines the desired state of Machine", + "io.openshift.machineconfiguration.v1alpha1.BuildInputs": { + "description": "BuildInputs holds all of the information needed to trigger a build", "type": "object", + "required": [ + "baseImagePullSecret", + "imageBuilder", + "renderedImagePushSecret", + "renderedImagePushspec" + ], "properties": { - "authoritativeAPI": { - "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI and ClusterAPI. When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy. When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy. Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API. Currently the authoritative API determines which controller will manage the resource, this will change in a future release. To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.", - "type": "string" - }, - "lifecycleHooks": { - "description": "LifecycleHooks allow users to pause operations on the machine at certain predefined points within the machine lifecycle.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.LifecycleHooks" - }, - "metadata": { - "description": "ObjectMeta will autopopulate the Node created. Use this to indicate what labels, annotations, name prefix, etc., should be used when creating the Node.", + "baseImagePullSecret": { + "description": "baseImagePullSecret is the secret used to pull the base image. must live in the openshift-machine-config-operator namespace", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.ObjectMeta" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference" }, - "providerID": { - "description": "ProviderID is the identification ID of the machine provided by the provider. This field must match the provider ID as seen on the node object corresponding to this machine. This field is required by higher level consumers of cluster-api. Example use case is cluster autoscaler with cluster-api as provider. Clean-up logic in the autoscaler compares machines to nodes to find out machines at provider which could not get registered as Kubernetes nodes. With cluster-api as a generic out-of-tree provider for autoscaler, this field is required by autoscaler to be able to have a provider view of the list of machines. Another list of nodes is queried from the k8s apiserver and then a comparison is done to find out unregistered machines and are marked for delete. This field will be set by the actuators and consumed by higher level entities like autoscaler that will be interfacing with cluster-api as generic provider.", + "baseOSExtensionsImagePullspec": { + "description": "baseOSExtensionsImagePullspec is the base Extensions image used in the build process the MachineOSConfig object will use the in cluster image registry configuration. if you wish to use a mirror or any other settings specific to registries.conf, please specify those in the cluster wide registries.conf. The format of the image pullspec is: host[:port][/namespace]/name@sha256:\u003cdigest\u003e", "type": "string" }, - "providerSpec": { - "description": "ProviderSpec details Provider-specific configuration to use during node creation.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.ProviderSpec" - }, - "taints": { - "description": "The list of the taints to be applied to the corresponding Node in additive manner. This list will not overwrite any other taints added to the Node on an ongoing basis by other entities. These taints should be actively reconciled e.g. if you ask the machine controller to apply a taint and then manually remove the taint the machine controller will put it back) but not have the machine controller remove any taints", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Taint" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.machine.v1beta1.MachineStatus": { - "description": "MachineStatus defines the observed state of Machine", - "type": "object", - "properties": { - "addresses": { - "description": "Addresses is a list of addresses assigned to the machine. Queried from cloud provider, if available.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.NodeAddress" - }, - "x-kubernetes-list-type": "atomic" - }, - "authoritativeAPI": { - "description": "authoritativeAPI is the API that is authoritative for this resource. Valid values are MachineAPI, ClusterAPI and Migrating. This value is updated by the migration controller to reflect the authoritative API. Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource. When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.", + "baseOSImagePullspec": { + "description": "baseOSImagePullspec is the base OSImage we use to build our custom image. the MachineOSConfig object will use the in cluster image registry configuration. if you wish to use a mirror or any other settings specific to registries.conf, please specify those in the cluster wide registries.conf. The format of the image pullspec is: host[:port][/namespace]/name@sha256:\u003cdigest\u003e", "type": "string" }, - "conditions": { - "description": "Conditions defines the current state of the Machine", + "containerFile": { + "description": "containerFile describes the custom data the user has specified to build into the image. this is also commonly called a Dockerfile and you can treat it as such. The content is the content of your Dockerfile.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.Condition" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSContainerfile" }, "x-kubernetes-list-map-keys": [ - "type" + "containerfileArch" ], - "x-kubernetes-list-type": "map" - }, - "errorMessage": { - "description": "ErrorMessage will be set in the event that there is a terminal problem reconciling the Machine and will contain a more verbose string suitable for logging and human consumption.\n\nThis field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the Machine's spec or the configuration of the controller, and that manual intervention is required. Examples of terminal errors would be invalid combinations of settings in the spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured.\n\nAny transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output.", - "type": "string" - }, - "errorReason": { - "description": "ErrorReason will be set in the event that there is a terminal problem reconciling the Machine and will contain a succinct value suitable for machine interpretation.\n\nThis field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the Machine's spec or the configuration of the controller, and that manual intervention is required. Examples of terminal errors would be invalid combinations of settings in the spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured.\n\nAny transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output.", - "type": "string" - }, - "lastOperation": { - "description": "LastOperation describes the last-operation performed by the machine-controller. This API should be useful as a history in terms of the latest operation performed on the specific machine. It should also convey the state of the latest-operation for example if it is still on-going, failed or completed successfully.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.LastOperation" - }, - "lastUpdated": { - "description": "LastUpdated identifies when this status was last observed.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "containerfileArch", + "x-kubernetes-patch-strategy": "merge" }, - "nodeRef": { - "description": "NodeRef will point to the corresponding Node if it exists.", - "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" + "imageBuilder": { + "description": "machineOSImageBuilder describes which image builder will be used in each build triggered by this MachineOSConfig", + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSImageBuilder" }, - "phase": { - "description": "Phase represents the current phase of machine actuation. One of: Failed, Provisioning, Provisioned, Running, Deleting", + "releaseVersion": { + "description": "releaseVersion is associated with the base OS Image. This is the version of Openshift that the Base Image is associated with. This field is populated from the machine-config-osimageurl configmap in the openshift-machine-config-operator namespace. It will come in the format: 4.16.0-0.nightly-2024-04-03-065948 or any valid release. The MachineOSBuilder populates this field and validates that this is a valid stream. This is used as a label in the dockerfile that builds the OS image.", "type": "string" }, - "providerStatus": { - "description": "ProviderStatus details a Provider-specific status. It is recommended that providers maintain their own versioned API types that should be serialized/deserialized from this field.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "renderedImagePushSecret": { + "description": "renderedImagePushSecret is the secret used to connect to a user registry. the final image push and pull secrets should be separate for security concerns. If the final image push secret is somehow exfiltrated, that gives someone the power to push images to the image repository. By comparison, if the final image pull secret gets exfiltrated, that only gives someone to pull images from the image repository. It's basically the principle of least permissions. this push secret will be used only by the MachineConfigController pod to push the image to the final destination. Not all nodes will need to push this image, most of them will only need to pull the image in order to use it.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference" }, - "synchronizedGeneration": { - "description": "synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with. This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.", - "type": "integer", - "format": "int64" + "renderedImagePushspec": { + "description": "renderedImagePushspec describes the location of the final image. the MachineOSConfig object will use the in cluster image registry configuration. if you wish to use a mirror or any other settings specific to registries.conf, please specify those in the cluster wide registries.conf. The format of the image pushspec is: host[:port][/namespace]/name:\u003ctag\u003e or svc_name.namespace.svc[:port]/repository/name:\u003ctag\u003e", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineStatus", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "BuildInputs", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MachineTemplateSpec": { - "description": "MachineTemplateSpec describes the data needed to create a Machine from a template", + "io.openshift.machineconfiguration.v1alpha1.BuildOutputs": { + "description": "BuildOutputs holds all information needed to handle booting the image after a build", "type": "object", "properties": { - "metadata": { - "description": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.ObjectMeta" - }, - "spec": { - "description": "Specification of the desired behavior of the machine. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status", + "currentImagePullSecret": { + "description": "currentImagePullSecret is the secret used to pull the final produced image. must live in the openshift-machine-config-operator namespace the final image push and pull secrets should be separate for security concerns. If the final image push secret is somehow exfiltrated, that gives someone the power to push images to the image repository. By comparison, if the final image pull secret gets exfiltrated, that only gives someone to pull images from the image repository. It's basically the principle of least permissions. this pull secret will be used on all nodes in the pool. These nodes will need to pull the final OS image and boot into it using rpm-ostree or bootc.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.MachineSpec" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MachineTemplateSpec", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "BuildOutputs", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "fields-to-discriminateBy": { + "currentImagePullSecret": "CurrentImagePullSecret" + } + } + ] + }, + "io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference": { + "description": "Refers to the name of an image registry push/pull secret needed in the build process.", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name is the name of the secret used to push or pull this MachineOSConfig object. this secret must be in the openshift-machine-config-operator namespace.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "ImageSecretObjectReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.MetadataServiceOptions": { - "description": "MetadataServiceOptions defines the options available to a user when configuring Instance Metadata Service (IMDS) Options.", + "io.openshift.machineconfiguration.v1alpha1.MCOObjectReference": { + "description": "MCOObjectReference holds information about an object the MCO either owns or modifies in some way", "type": "object", + "required": [ + "name" + ], "properties": { - "authentication": { - "description": "Authentication determines whether or not the host requires the use of authentication when interacting with the metadata service. When using authentication, this enforces v2 interaction method (IMDSv2) with the metadata service. When omitted, this means the user has no opinion and the value is left to the platform to choose a good default, which is subject to change over time. The current default is optional. At this point this field represents `HttpTokens` parameter from `InstanceMetadataOptionsRequest` structure in AWS EC2 API https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceMetadataOptionsRequest.html", - "type": "string" + "name": { + "description": "name is the object name. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "MetadataServiceOptions", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MCOObjectReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.NetworkDeviceSpec": { - "description": "NetworkDeviceSpec defines the network configuration for a virtual machine's network device.", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNode": { + "description": "MachineConfigNode describes the health of the Machines on the system Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "spec" + ], "properties": { - "addressesFromPools": { - "description": "addressesFromPools is a list of references to IP pool types and instances which are handled by an external controller. addressesFromPool configurations provided via addressesFromPools defer IP address assignment to an external controller. IP addresses provided via ipAddrs, however, are intended to allow explicit assignment of a machine's IP address. If both addressesFromPool and ipAddrs are empty or not defined, DHCP will assign an IP address. If both ipAddrs and addressesFromPools are defined, the IP addresses associated with ipAddrs will be applied first followed by IP addresses from addressesFromPools.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.AddressesFromPool" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "gateway": { - "description": "gateway is an IPv4 or IPv6 address which represents the subnet gateway, for example, 192.168.1.1.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "ipAddrs": { - "description": "ipAddrs is a list of one or more IPv4 and/or IPv6 addresses and CIDR to assign to this device, for example, 192.168.1.100/24. IP addresses provided via ipAddrs are intended to allow explicit assignment of a machine's IP address. IP pool configurations provided via addressesFromPool, however, defer IP address assignment to an external controller. If both addressesFromPool and ipAddrs are empty or not defined, DHCP will be used to assign an IP address. If both ipAddrs and addressesFromPools are defined, the IP addresses associated with ipAddrs will be applied first followed by IP addresses from addressesFromPools.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "nameservers": { - "description": "nameservers is a list of IPv4 and/or IPv6 addresses used as DNS nameservers, for example, 8.8.8.8. a nameserver is not provided by a fulfilled IPAddressClaim. If DHCP is not the source of IP addresses for this network device, nameservers should include a valid nameserver.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "spec": { + "description": "spec describes the configuration of the machine config node.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpec" }, - "networkName": { - "description": "networkName is the name of the vSphere network or port group to which the network device will be connected, for example, port-group-1. When not provided, the vCenter API will attempt to select a default network. The available networks (port groups) can be listed using `govc ls 'network/*'`", - "type": "string" + "status": { + "description": "status describes the last observed state of this machine config node.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "NetworkDeviceSpec", - "Scope": "Namespaced" + "Type": "object", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNode", + "Scope": "Clustered" } }, - "io.openshift.machine.v1beta1.NetworkSpec": { - "description": "NetworkSpec defines the virtual machine's network configuration.", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeList": { + "description": "MachineConfigNodeList describes all of the MachinesStates on the system\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "devices" + "metadata", + "items" ], "properties": { - "devices": { - "description": "Devices defines the virtual machine's network interfaces.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.NetworkDeviceSpec" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNode" } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "NetworkSpec", + "Type": "list", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.OSDisk": { + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpec": { + "description": "MachineConfigNodeSpec describes the MachineConfigNode we are managing.", "type": "object", "required": [ - "osType", - "managedDisk", - "diskSizeGB" + "node", + "pool", + "configVersion" ], "properties": { - "cachingType": { - "description": "CachingType specifies the caching requirements. Possible values include: 'None', 'ReadOnly', 'ReadWrite'. Empty value means no opinion and the platform chooses a default, which is subject to change over time. Currently the default is `None`.", - "type": "string" + "configVersion": { + "description": "configVersion holds the desired config version for the node targeted by this machine config node resource. The desired version represents the machine config the node will attempt to update to. This gets set before the machine config operator validates the new machine config against the current machine config.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecMachineConfigVersion" }, - "diskSettings": { - "description": "DiskSettings describe ephemeral disk settings for the os disk.", + "node": { + "description": "node contains a reference to the node for this machine config node.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskSettings" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MCOObjectReference" }, - "diskSizeGB": { - "description": "DiskSizeGB is the size in GB to assign to the data disk.", - "type": "integer", - "format": "int32", - "default": 0 + "pinnedImageSets": { + "description": "pinnedImageSets holds the desired pinned image sets that this node should pin and pull.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecPinnedImageSet" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" }, - "managedDisk": { - "description": "ManagedDisk specifies the Managed Disk parameters for the OS disk.", + "pool": { + "description": "pool contains a reference to the machine config pool that this machine config node's referenced node belongs to.", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.OSDiskManagedDiskParameters" - }, - "osType": { - "description": "OSType is the operating system type of the OS disk. Possible values include \"Linux\" and \"Windows\".", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MCOObjectReference" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "OSDisk", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.OSDiskManagedDiskParameters": { - "description": "OSDiskManagedDiskParameters is the parameters of a OSDisk managed disk.", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecMachineConfigVersion": { + "description": "MachineConfigNodeSpecMachineConfigVersion holds the desired config version for the current observed machine config node. When Current is not equal to Desired; the MachineConfigOperator is in an upgrade phase and the machine config node will take account of upgrade related events. Otherwise they will be ignored given that certain operations happen both during the MCO's upgrade mode and the daily operations mode.", "type": "object", "required": [ - "storageAccountType" + "desired" ], "properties": { - "diskEncryptionSet": { - "description": "DiskEncryptionSet is the disk encryption set properties", - "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskEncryptionSetParameters" - }, - "securityProfile": { - "description": "securityProfile specifies the security profile for the managed disk.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.VMDiskSecurityProfile" - }, - "storageAccountType": { - "description": "StorageAccountType is the storage account type to use. Possible values include \"Standard_LRS\", \"Premium_LRS\".", + "desired": { + "description": "desired is the name of the machine config that the the node should be upgraded to. This value is set when the machine config pool generates a new version of its rendered configuration. When this value is changed, the machine config daemon starts the node upgrade process. This value gets set in the machine config node spec once the machine config has been targeted for upgrade and before it is validated. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "OSDiskManagedDiskParameters", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeSpecMachineConfigVersion", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.ObjectMeta": { - "description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create. This is a copy of customizable fields from metav1.ObjectMeta.\n\nObjectMeta is embedded in `Machine.Spec`, `MachineDeployment.Template` and `MachineSet.Template`, which are not top-level Kubernetes objects. Given that metav1.ObjectMeta has lots of special cases and read-only fields which end up in the generated CRD validation, having it as a subset simplifies the API and some issues that can impact user experience.\n\nDuring the [upgrade to controller-tools@v2](https://github.com/kubernetes-sigs/cluster-api/pull/1054) for v1alpha2, we noticed a failure would occur running Cluster API test suite against the new CRDs, specifically `spec.metadata.creationTimestamp in body must be of type string: \"null\"`. The investigation showed that `controller-tools@v2` behaves differently than its previous version when handling types from [metav1](k8s.io/apimachinery/pkg/apis/meta/v1) package.\n\nIn more details, we found that embedded (non-top level) types that embedded `metav1.ObjectMeta` had validation properties, including for `creationTimestamp` (metav1.Time). The `metav1.Time` type specifies a custom json marshaller that, when IsZero() is true, returns `null` which breaks validation because the field isn't marked as nullable.\n\nIn future versions, controller-tools@v2 might allow overriding the type and validation for embedded types. When that happens, this hack should be revisited.", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecPinnedImageSet": { "type": "object", + "required": [ + "name" + ], "properties": { - "annotations": { - "description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "generateName": { - "description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency", - "type": "string" - }, - "labels": { - "description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, "name": { - "description": "Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names", - "type": "string" - }, - "namespace": { - "description": "Namespace defines the space within each name must be unique. An empty namespace is equivalent to the \"default\" namespace, but \"default\" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.\n\nMust be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces", - "type": "string" - }, - "ownerReferences": { - "description": "List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference" - }, - "x-kubernetes-list-map-keys": [ - "uid" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "uid", - "x-kubernetes-patch-strategy": "merge" + "description": "name is the name of the pinned image set. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "ObjectMeta", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeSpecPinnedImageSet", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.Placement": { - "description": "Placement indicates where to create the instance in AWS", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatus": { + "description": "MachineConfigNodeStatus holds the reported information on a particular machine config node.", "type": "object", + "required": [ + "configVersion" + ], "properties": { - "availabilityZone": { - "description": "AvailabilityZone is the availability zone of the instance", - "type": "string" + "conditions": { + "description": "conditions represent the observations of a machine config node's current state.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" }, - "region": { - "description": "Region is the region to use to create the instance", - "type": "string" + "configVersion": { + "description": "configVersion describes the current and desired machine config for this node. The current version represents the current machine config for the node and is updated after a successful update. The desired version represents the machine config the node will attempt to update to. This desired machine config has been compared to the current machine config and has been validated by the machine config operator as one that is valid and that exists.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusMachineConfigVersion" }, - "tenancy": { - "description": "Tenancy indicates if instance should run on shared or single-tenant hardware. There are supported 3 options: default, dedicated and host.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "Placement", - "Scope": "Namespaced" - } - }, - "io.openshift.machine.v1beta1.ProviderSpec": { - "description": "ProviderSpec defines the configuration to use during node creation.", - "type": "object", - "properties": { - "value": { - "description": "Value is an inlined, serialized representation of the resource configuration. It is recommended that providers maintain their own versioned API types that should be serialized/deserialized from this field, akin to component config.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "observedGeneration": { + "description": "observedGeneration represents the generation observed by the controller. This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.", + "type": "integer", + "format": "int64" + }, + "pinnedImageSets": { + "description": "pinnedImageSets describes the current and desired pinned image sets for this node. The current version is the generation of the pinned image set that has most recently been successfully pulled and pinned on this node. The desired version is the generation of the pinned image set that is targeted to be pulled and pinned on this node.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusPinnedImageSet" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "ProviderSpec", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.ResourceManagerTag": { - "description": "ResourceManagerTag is a tag to apply to GCP resources created for the cluster.", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusMachineConfigVersion": { + "description": "MachineConfigNodeStatusMachineConfigVersion holds the current and desired config versions as last updated in the MCN status. When the current and desired versions are not matched, the machine config pool is processing an upgrade and the machine config node will monitor the upgrade process. When the current and desired versions do not match, the machine config node will ignore these events given that certain operations happen both during the MCO's upgrade mode and the daily operations mode.", "type": "object", "required": [ - "parentID", - "key", - "value" + "desired" ], "properties": { - "key": { - "description": "key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty. Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `._-`.", - "type": "string", - "default": "" - }, - "parentID": { - "description": "parentID is the ID of the hierarchical resource where the tags are defined e.g. at the Organization or the Project level. To find the Organization or Project ID ref https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects An OrganizationID can have a maximum of 32 characters and must consist of decimal numbers, and cannot have leading zeroes. A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers, and hyphens, and must start with a letter, and cannot end with a hyphen.", + "current": { + "description": "current is the name of the machine config currently in use on the node. This value is updated once the machine config daemon has completed the update of the configuration for the node. This value should match the desired version unless an upgrade is in progress. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", "type": "string", "default": "" }, - "value": { - "description": "value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty. Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `_-.@%=+:,*#\u0026(){}[]` and spaces.", + "desired": { + "description": "desired is the MachineConfig the node wants to upgrade to. This value gets set in the machine config node status once the machine config has been validated against the current machine config. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "ResourceManagerTag", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeStatusMachineConfigVersion", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.SecurityProfile": { - "description": "SecurityProfile specifies the Security profile settings for a virtual machine or virtual machine scale set.", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusPinnedImageSet": { "type": "object", + "required": [ + "name" + ], "properties": { - "encryptionAtHost": { - "description": "encryptionAtHost indicates whether Host Encryption should be enabled or disabled for a virtual machine or virtual machine scale set. This should be disabled when SecurityEncryptionType is set to DiskWithVMGuestState. Default is disabled.", - "type": "boolean" + "currentGeneration": { + "description": "currentGeneration is the generation of the pinned image set that has most recently been successfully pulled and pinned on this node.", + "type": "integer", + "format": "int32" }, - "settings": { - "description": "settings specify the security type and the UEFI settings of the virtual machine. This field can be set for Confidential VMs and Trusted Launch for VMs.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.SecuritySettings" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "SecurityProfile", - "Scope": "Namespaced" - } - }, - "io.openshift.machine.v1beta1.SecuritySettings": { - "description": "SecuritySettings define the security type and the UEFI settings of the virtual machine.", - "type": "object", - "properties": { - "confidentialVM": { - "description": "confidentialVM specifies the security configuration of the virtual machine. For more information regarding Confidential VMs, please refer to: https://learn.microsoft.com/azure/confidential-computing/confidential-vm-overview", - "$ref": "#/definitions/io.openshift.machine.v1beta1.ConfidentialVM" + "desiredGeneration": { + "description": "desiredGeneration version is the generation of the pinned image set that is targeted to be pulled and pinned on this node.", + "type": "integer", + "format": "int32" }, - "securityType": { - "description": "securityType specifies the SecurityType of the virtual machine. It has to be set to any specified value to enable UEFISettings. The default behavior is: UEFISettings will not be enabled unless this property is set.", - "type": "string" + "lastFailedGeneration": { + "description": "lastFailedGeneration is the generation of the most recent pinned image set that failed to be pulled and pinned on this node.", + "type": "integer", + "format": "int32" }, - "trustedLaunch": { - "description": "trustedLaunch specifies the security configuration of the virtual machine. For more information regarding TrustedLaunch for VMs, please refer to: https://learn.microsoft.com/azure/virtual-machines/trusted-launch", - "$ref": "#/definitions/io.openshift.machine.v1beta1.TrustedLaunch" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "SecuritySettings", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "securityType", - "fields-to-discriminateBy": { - "confidentialVM": "ConfidentialVM", - "trustedLaunch": "TrustedLaunch" + "lastFailedGenerationErrors": { + "description": "lastFailedGenerationErrors is a list of errors why the lastFailed generation failed to be pulled and pinned.", + "type": "array", + "items": { + "type": "string", + "default": "" } - } - ] - }, - "io.openshift.machine.v1beta1.SpotMarketOptions": { - "description": "SpotMarketOptions defines the options available to a user when configuring Machines to run on Spot instances. Most users should provide an empty struct.", - "type": "object", - "properties": { - "maxPrice": { - "description": "The maximum price the user is willing to pay for their instances Default: On-Demand price", - "type": "string" + }, + "name": { + "description": "name is the name of the pinned image set. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "SpotMarketOptions", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigNodeStatusPinnedImageSet", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.SpotVMOptions": { - "description": "SpotVMOptions defines the options relevant to running the Machine on Spot VMs", + "io.openshift.machineconfiguration.v1alpha1.MachineConfigPoolReference": { + "description": "Refers to the name of a MachineConfigPool (e.g., \"worker\", \"infra\", etc.): the MachineOSBuilder pod validates that the user has provided a valid pool", "type": "object", + "required": [ + "name" + ], "properties": { - "maxPrice": { - "description": "MaxPrice defines the maximum price the user is willing to pay for Spot VM instances", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + "name": { + "description": "name of the MachineConfigPool object.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "SpotVMOptions", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineConfigPoolReference", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.TagSpecification": { - "description": "TagSpecification is the name/value pair for a tag", + "io.openshift.machineconfiguration.v1alpha1.MachineOSBuild": { + "description": "MachineOSBuild describes a build process managed and deployed by the MCO Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "name", - "value" + "spec" ], "properties": { - "name": { - "description": "Name of the tag", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "value": { - "description": "Value of the tag", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec describes the configuration of the machine os build", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuildSpec" + }, + "status": { + "description": "status describes the lst observed state of this machine os build", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuildStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "TagSpecification", - "Scope": "Namespaced" + "Type": "object", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSBuild", + "Scope": "Clustered" } }, - "io.openshift.machine.v1beta1.TrustedLaunch": { - "description": "TrustedLaunch defines the UEFI settings for the virtual machine.", + "io.openshift.machineconfiguration.v1alpha1.MachineOSBuildList": { + "description": "MachineOSBuildList describes all of the Builds on the system\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "metadata", + "items" + ], "properties": { - "uefiSettings": { - "description": "uefiSettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuild" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.UEFISettings" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "TrustedLaunch", + "Type": "list", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSBuildList", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.UEFISettings": { - "description": "UEFISettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "io.openshift.machineconfiguration.v1alpha1.MachineOSBuildSpec": { + "description": "MachineOSBuildSpec describes information about a build process primarily populated from a MachineOSConfig object.", "type": "object", + "required": [ + "configGeneration", + "desiredConfig", + "machineOSConfig", + "version", + "renderedImagePushspec" + ], "properties": { - "secureBoot": { - "description": "secureBoot specifies whether secure boot should be enabled on the virtual machine. Secure Boot verifies the digital signature of all boot components and halts the boot process if signature verification fails. If omitted, the platform chooses a default, which is subject to change over time, currently that default is disabled.", - "type": "string" + "configGeneration": { + "description": "configGeneration tracks which version of MachineOSConfig this build is based off of", + "type": "integer", + "format": "int64", + "default": 0 }, - "virtualizedTrustedPlatformModule": { - "description": "virtualizedTrustedPlatformModule specifies whether vTPM should be enabled on the virtual machine. When enabled the virtualized trusted platform module measurements are used to create a known good boot integrity policy baseline. The integrity policy baseline is used for comparison with measurements from subsequent VM boots to determine if anything has changed. This is required to be enabled if SecurityEncryptionType is defined. If omitted, the platform chooses a default, which is subject to change over time, currently that default is disabled.", - "type": "string" + "desiredConfig": { + "description": "desiredConfig is the desired config we want to build an image for.", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.RenderedMachineConfigReference" + }, + "machineOSConfig": { + "description": "machineOSConfig is the config object which the build is based off of", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfigReference" + }, + "renderedImagePushspec": { + "description": "renderedImagePushspec is set from the MachineOSConfig The format of the image pullspec is: host[:port][/namespace]/name:\u003ctag\u003e or svc_name.namespace.svc[:port]/repository/name:\u003ctag\u003e", + "type": "string", + "default": "" + }, + "version": { + "description": "version tracks the newest MachineOSBuild for each MachineOSConfig", + "type": "integer", + "format": "int64", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "UEFISettings", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSBuildSpec", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.UnhealthyCondition": { - "description": "UnhealthyCondition represents a Node condition type and value with a timeout specified as a duration. When the named condition has been in the given status for at least the timeout value, a node is considered unhealthy.", + "io.openshift.machineconfiguration.v1alpha1.MachineOSBuildStatus": { + "description": "MachineOSBuildStatus describes the state of a build and other helpful information.", "type": "object", "required": [ - "type", - "status", - "timeout" + "buildStart" ], "properties": { - "status": { - "type": "string", - "default": "" + "buildEnd": { + "description": "buildEnd describes when the build ended.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "timeout": { - "description": "Expects an unsigned duration string of decimal numbers each with optional fraction and a unit suffix, eg \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".", - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "buildStart": { + "description": "buildStart describes when the build started.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "type": { - "type": "string", - "default": "" + "builderReference": { + "description": "ImageBuilderType describes the image builder set in the MachineOSConfig", + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuilderReference" + }, + "conditions": { + "description": "conditions are state related conditions for the build. Valid types are: Prepared, Building, Failed, Interrupted, and Succeeded once a Build is marked as Failed, no future conditions can be set. This is enforced by the MCO.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "finalImagePullspec": { + "description": "finalImagePushSpec describes the fully qualified pushspec produced by this build that the final image can be. Must be in sha format.", + "type": "string" + }, + "relatedObjects": { + "description": "relatedObjects is a list of objects that are related to the build process.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ObjectReference" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "UnhealthyCondition", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSBuildStatus", "Scope": "Namespaced" } }, - "io.openshift.machine.v1beta1.VMDiskSecurityProfile": { - "description": "VMDiskSecurityProfile specifies the security profile settings for the managed disk. It can be set only for Confidential VMs.", + "io.openshift.machineconfiguration.v1alpha1.MachineOSBuilderReference": { + "description": "MachineOSBuilderReference describes which ImageBuilder backend to use for this build/", "type": "object", + "required": [ + "imageBuilderType" + ], "properties": { - "diskEncryptionSet": { - "description": "diskEncryptionSet specifies the customer managed disk encryption set resource id for the managed disk that is used for Customer Managed Key encrypted ConfidentialVM OS Disk and VMGuest blob.", - "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.DiskEncryptionSetParameters" + "buildPod": { + "description": "relatedObjects is a list of objects that are related to the build process.", + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ObjectReference" }, - "securityEncryptionType": { - "description": "securityEncryptionType specifies the encryption type of the managed disk. It is set to DiskWithVMGuestState to encrypt the managed disk along with the VMGuestState blob, and to VMGuestStateOnly to encrypt the VMGuestState blob only. When set to VMGuestStateOnly, the vTPM should be enabled. When set to DiskWithVMGuestState, both SecureBoot and vTPM should be enabled. If the above conditions are not fulfilled, the VM will not be created and the respective error will be returned. It can be set only for Confidential VMs. Confidential VMs are defined by their SecurityProfile.SecurityType being set to ConfidentialVM, the SecurityEncryptionType of their OS disk being set to one of the allowed values and by enabling the respective SecurityProfile.UEFISettings of the VM (i.e. vTPM and SecureBoot), depending on the selected SecurityEncryptionType. For further details on Azure Confidential VMs, please refer to the respective documentation: https://learn.microsoft.com/azure/confidential-computing/confidential-vm-overview", - "type": "string" + "imageBuilderType": { + "description": "ImageBuilderType describes the image builder set in the MachineOSConfig", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "VMDiskSecurityProfile", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSBuilderReference", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "imageBuilderType", + "fields-to-discriminateBy": { + "buildPod": "PodImageBuilder" + } + } + ] }, - "io.openshift.machine.v1beta1.VSphereMachineProviderSpec": { - "description": "VSphereMachineProviderSpec is the type that will be embedded in a Machine.Spec.ProviderSpec field for an VSphere virtual machine. It is used by the vSphere machine actuator to create a single Machine. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1alpha1.MachineOSConfig": { + "description": "MachineOSConfig describes the configuration for a build process managed by the MCO Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "template", - "network" + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "cloneMode": { - "description": "CloneMode specifies the type of clone operation. The LinkedClone mode is only support for templates that have at least one snapshot. If the template has no snapshots, then CloneMode defaults to FullClone. When LinkedClone mode is enabled the DiskGiB field is ignored as it is not possible to expand disks of linked clones. Defaults to FullClone. When using LinkedClone, if no snapshots exist for the source template, falls back to FullClone.", - "type": "string" - }, - "credentialsSecret": { - "description": "CredentialsSecret is a reference to the secret with vSphere credentials.", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" - }, - "diskGiB": { - "description": "DiskGiB is the size of a virtual machine's disk, in GiB. Defaults to the analogue property value in the template from which this machine is cloned. This parameter will be ignored if 'LinkedClone' CloneMode is set.", - "type": "integer", - "format": "int32" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "memoryMiB": { - "description": "MemoryMiB is the size of a virtual machine's memory, in MiB. Defaults to the analogue property value in the template from which this machine is cloned.", - "type": "integer", - "format": "int64" - }, "metadata": { "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "network": { - "description": "Network is the network configuration for this machine's VM.", + "spec": { + "description": "spec describes the configuration of the machineosconfig", "default": {}, - "$ref": "#/definitions/io.openshift.machine.v1beta1.NetworkSpec" - }, - "numCPUs": { - "description": "NumCPUs is the number of virtual processors in a virtual machine. Defaults to the analogue property value in the template from which this machine is cloned.", - "type": "integer", - "format": "int32" - }, - "numCoresPerSocket": { - "description": "NumCPUs is the number of cores among which to distribute CPUs in this virtual machine. Defaults to the analogue property value in the template from which this machine is cloned.", - "type": "integer", - "format": "int32" - }, - "snapshot": { - "description": "Snapshot is the name of the snapshot from which the VM was cloned", - "type": "string", - "default": "" - }, - "tagIDs": { - "description": "tagIDs is an optional set of tags to add to an instance. Specified tagIDs must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "template": { - "description": "Template is the name, inventory path, or instance UUID of the template used to clone new machines.", - "type": "string", - "default": "" - }, - "userDataSecret": { - "description": "UserDataSecret contains a local reference to a secret that contains the UserData to apply to the instance", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfigSpec" }, - "workspace": { - "description": "Workspace describes the workspace to use for the machine.", - "$ref": "#/definitions/io.openshift.machine.v1beta1.Workspace" + "status": { + "description": "status describes the status of the machineosconfig", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfigStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "VSphereMachineProviderSpec", - "Scope": "Namespaced" + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSConfig", + "Scope": "Clustered" } }, - "io.openshift.machine.v1beta1.VSphereMachineProviderStatus": { - "description": "VSphereMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. It contains VSphere-specific status information. Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).", + "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigList": { + "description": "MachineOSConfigList describes all configurations for image builds on the system\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", + "required": [ + "items" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "conditions": { - "description": "Conditions is a set of conditions associated with the Machine to indicate errors or other status", + "items": { "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfig" } }, - "instanceId": { - "description": "InstanceID is the ID of the instance in VSphere", - "type": "string" - }, - "instanceState": { - "description": "InstanceState is the provisioning state of the VSphere Instance.", - "type": "string" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "taskRef": { - "description": "TaskRef is a managed object reference to a Task related to the machine. This value is set automatically at runtime and should not be set or modified by users.", - "type": "string" + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "VSphereMachineProviderStatus", + "Type": "list", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSConfigList", "Scope": "Namespaced" } - }, - "io.openshift.machine.v1beta1.Workspace": { - "description": "WorkspaceConfig defines a workspace configuration for the vSphere cloud provider.", - "type": "object", - "properties": { - "datacenter": { - "description": "Datacenter is the datacenter in which VMs are created/located.", - "type": "string" - }, - "datastore": { - "description": "Datastore is the datastore in which VMs are created/located.", - "type": "string" - }, - "folder": { - "description": "Folder is the folder in which VMs are created/located.", - "type": "string" - }, - "resourcePool": { - "description": "ResourcePool is the resource pool in which VMs are created/located.", - "type": "string" - }, - "server": { - "description": "Server is the IP address or FQDN of the vSphere endpoint.", - "type": "string" + }, + "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigReference": { + "description": "MachineOSConfigReference refers to the MachineOSConfig this build is based off of", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name of the MachineOSConfig", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machine.openshift.io", - "Version": "v1beta1", - "Kind": "Workspace", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSConfigReference", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.BuildInputs": { - "description": "BuildInputs holds all of the information needed to trigger a build", + "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigSpec": { + "description": "MachineOSConfigSpec describes user-configurable options as well as information about a build process.", "type": "object", "required": [ - "baseImagePullSecret", - "imageBuilder", - "renderedImagePushSecret", - "renderedImagePushspec" + "machineConfigPool", + "buildInputs" ], "properties": { - "baseImagePullSecret": { - "description": "baseImagePullSecret is the secret used to pull the base image. must live in the openshift-machine-config-operator namespace", + "buildInputs": { + "description": "buildInputs is where user input options for the build live", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference" - }, - "baseOSExtensionsImagePullspec": { - "description": "baseOSExtensionsImagePullspec is the base Extensions image used in the build process the MachineOSConfig object will use the in cluster image registry configuration. if you wish to use a mirror or any other settings specific to registries.conf, please specify those in the cluster wide registries.conf. The format of the image pullspec is: host[:port][/namespace]/name@sha256:\u003cdigest\u003e", - "type": "string" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.BuildInputs" }, - "baseOSImagePullspec": { - "description": "baseOSImagePullspec is the base OSImage we use to build our custom image. the MachineOSConfig object will use the in cluster image registry configuration. if you wish to use a mirror or any other settings specific to registries.conf, please specify those in the cluster wide registries.conf. The format of the image pullspec is: host[:port][/namespace]/name@sha256:\u003cdigest\u003e", - "type": "string" + "buildOutputs": { + "description": "buildOutputs is where user input options for the build live", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.BuildOutputs" }, - "containerFile": { - "description": "containerFile describes the custom data the user has specified to build into the image. this is also commonly called a Dockerfile and you can treat it as such. The content is the content of your Dockerfile.", + "machineConfigPool": { + "description": "machineConfigPool is the pool which the build is for", + "default": {}, + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigPoolReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSConfigSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigStatus": { + "description": "MachineOSConfigStatus describes the status this config object and relates it to the builds associated with this MachineOSConfig", + "type": "object", + "properties": { + "conditions": { + "description": "conditions are state related conditions for the config.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSContainerfile" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" }, "x-kubernetes-list-map-keys": [ - "containerfileArch" + "type" ], "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "containerfileArch", + "x-kubernetes-patch-merge-key": "type", "x-kubernetes-patch-strategy": "merge" }, - "imageBuilder": { - "description": "machineOSImageBuilder describes which image builder will be used in each build triggered by this MachineOSConfig", - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSImageBuilder" - }, - "releaseVersion": { - "description": "releaseVersion is associated with the base OS Image. This is the version of Openshift that the Base Image is associated with. This field is populated from the machine-config-osimageurl configmap in the openshift-machine-config-operator namespace. It will come in the format: 4.16.0-0.nightly-2024-04-03-065948 or any valid release. The MachineOSBuilder populates this field and validates that this is a valid stream. This is used as a label in the dockerfile that builds the OS image.", + "currentImagePullspec": { + "description": "currentImagePullspec is the fully qualified image pull spec used by the MCO to pull down the new OSImage. This must include sha256.", "type": "string" }, - "renderedImagePushSecret": { - "description": "renderedImagePushSecret is the secret used to connect to a user registry. the final image push and pull secrets should be separate for security concerns. If the final image push secret is somehow exfiltrated, that gives someone the power to push images to the image repository. By comparison, if the final image pull secret gets exfiltrated, that only gives someone to pull images from the image repository. It's basically the principle of least permissions. this push secret will be used only by the MachineConfigController pod to push the image to the final destination. Not all nodes will need to push this image, most of them will only need to pull the image in order to use it.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference" + "observedGeneration": { + "description": "observedGeneration represents the generation observed by the controller. this field is updated when the user changes the configuration in BuildSettings or the MCP this object is associated with.", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "machineconfiguration.openshift.io", + "Version": "v1alpha1", + "Kind": "MachineOSConfigStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.machineconfiguration.v1alpha1.MachineOSContainerfile": { + "description": "MachineOSContainerfile contains all custom content the user wants built into the image", + "type": "object", + "required": [ + "content" + ], + "properties": { + "containerfileArch": { + "description": "containerfileArch describes the architecture this containerfile is to be built for this arch is optional. If the user does not specify an architecture, it is assumed that the content can be applied to all architectures, or in a single arch cluster: the only architecture.", + "type": "string", + "default": "" }, - "renderedImagePushspec": { - "description": "renderedImagePushspec describes the location of the final image. the MachineOSConfig object will use the in cluster image registry configuration. if you wish to use a mirror or any other settings specific to registries.conf, please specify those in the cluster wide registries.conf. The format of the image pushspec is: host[:port][/namespace]/name:\u003ctag\u003e or svc_name.namespace.svc[:port]/repository/name:\u003ctag\u003e", + "content": { + "description": "content is the custom content to be built", "type": "string", "default": "" } @@ -39523,44 +43884,55 @@ "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "BuildInputs", + "Kind": "MachineOSContainerfile", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.BuildOutputs": { - "description": "BuildOutputs holds all information needed to handle booting the image after a build", + "io.openshift.machineconfiguration.v1alpha1.MachineOSImageBuilder": { "type": "object", + "required": [ + "imageBuilderType" + ], "properties": { - "currentImagePullSecret": { - "description": "currentImagePullSecret is the secret used to pull the final produced image. must live in the openshift-machine-config-operator namespace the final image push and pull secrets should be separate for security concerns. If the final image push secret is somehow exfiltrated, that gives someone the power to push images to the image repository. By comparison, if the final image pull secret gets exfiltrated, that only gives someone to pull images from the image repository. It's basically the principle of least permissions. this pull secret will be used on all nodes in the pool. These nodes will need to pull the final OS image and boot into it using rpm-ostree or bootc.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference" + "imageBuilderType": { + "description": "imageBuilderType specifies the backend to be used to build the image. Valid options are: PodImageBuilder", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "BuildOutputs", + "Kind": "MachineOSImageBuilder", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "fields-to-discriminateBy": { - "currentImagePullSecret": "CurrentImagePullSecret" - } - } - ] + } }, - "io.openshift.machineconfiguration.v1alpha1.ImageSecretObjectReference": { - "description": "Refers to the name of an image registry push/pull secret needed in the build process.", + "io.openshift.machineconfiguration.v1alpha1.ObjectReference": { + "description": "ObjectReference contains enough information to let you inspect or modify the referred object.", "type": "object", "required": [ + "group", + "resource", "name" ], "properties": { + "group": { + "description": "group of the referent.", + "type": "string", + "default": "" + }, "name": { - "description": "name is the name of the secret used to push or pull this MachineOSConfig object. this secret must be in the openshift-machine-config-operator namespace.", + "description": "name of the referent.", + "type": "string", + "default": "" + }, + "namespace": { + "description": "namespace of the referent.", + "type": "string" + }, + "resource": { + "description": "resource of the referent.", "type": "string", "default": "" } @@ -39569,19 +43941,18 @@ "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "ImageSecretObjectReference", + "Kind": "ObjectReference", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MCOObjectReference": { - "description": "MCOObjectReference holds information about an object the MCO either owns or modifies in some way", + "io.openshift.machineconfiguration.v1alpha1.PinnedImageRef": { "type": "object", "required": [ "name" ], "properties": { "name": { - "description": "name is the object name. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", + "description": "name is an OCI Image referenced by digest.\n\nThe format of the image ref is: host[:port][/namespace]/name@sha256:\u003cdigest\u003e", "type": "string", "default": "" } @@ -39590,12 +43961,12 @@ "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "MCOObjectReference", + "Kind": "PinnedImageRef", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNode": { - "description": "MachineConfigNode describes the health of the Machines on the system Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.machineconfiguration.v1alpha1.PinnedImageSet": { + "description": "PinnedImageSet describes a set of images that should be pinned by CRI-O and pulled to the nodes which are members of the declared MachineConfigPools.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "spec" @@ -39614,26 +43985,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec describes the configuration of the machine config node.", + "description": "spec describes the configuration of this pinned image set.", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpec" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageSetSpec" }, "status": { - "description": "status describes the last observed state of this machine config node.", + "description": "status describes the last observed state of this pinned image set.", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatus" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageSetStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "MachineConfigNode", + "Kind": "PinnedImageSet", "Scope": "Clustered" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeList": { - "description": "MachineConfigNodeList describes all of the MachinesStates on the system\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.machineconfiguration.v1alpha1.PinnedImageSetList": { + "description": "PinnedImageSetList is a list of PinnedImageSet resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "metadata", @@ -39648,7 +44019,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNode" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageSet" } }, "kind": { @@ -39656,6 +44027,7 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } @@ -39664,84 +44036,74 @@ "Type": "list", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "MachineConfigNodeList", + "Kind": "PinnedImageSetList", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpec": { - "description": "MachineConfigNodeSpec describes the MachineConfigNode we are managing.", + "io.openshift.machineconfiguration.v1alpha1.PinnedImageSetSpec": { + "description": "PinnedImageSetSpec defines the desired state of a PinnedImageSet.", "type": "object", "required": [ - "node", - "pool", - "configVersion" + "pinnedImages" ], "properties": { - "configVersion": { - "description": "configVersion holds the desired config version for the node targeted by this machine config node resource. The desired version represents the machine config the node will attempt to update to. This gets set before the machine config operator validates the new machine config against the current machine config.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecMachineConfigVersion" - }, - "node": { - "description": "node contains a reference to the node for this machine config node.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MCOObjectReference" - }, - "pinnedImageSets": { - "description": "pinnedImageSets holds the desired pinned image sets that this node should pin and pull.", + "pinnedImages": { + "description": "pinnedImages is a list of OCI Image referenced by digest that should be pinned and pre-loaded by the nodes of a MachineConfigPool. Translates into a new file inside the /etc/crio/crio.conf.d directory with content similar to this:\n\n pinned_images = [\n \"quay.io/openshift-release-dev/ocp-release@sha256:...\",\n \"quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...\",\n \"quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...\",\n ...\n ]\n\nThese image references should all be by digest, tags aren't allowed.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecPinnedImageSet" + "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageRef" }, "x-kubernetes-list-map-keys": [ "name" ], "x-kubernetes-list-type": "map" - }, - "pool": { - "description": "pool contains a reference to the machine config pool that this machine config node's referenced node belongs to.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MCOObjectReference" } }, "x-fabric8-info": { "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "MachineConfigNodeSpec", + "Kind": "PinnedImageSetSpec", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecMachineConfigVersion": { - "description": "MachineConfigNodeSpecMachineConfigVersion holds the desired config version for the current observed machine config node. When Current is not equal to Desired; the MachineConfigOperator is in an upgrade phase and the machine config node will take account of upgrade related events. Otherwise they will be ignored given that certain operations happen both during the MCO's upgrade mode and the daily operations mode.", + "io.openshift.machineconfiguration.v1alpha1.PinnedImageSetStatus": { + "description": "PinnedImageSetStatus describes the current state of a PinnedImageSet.", "type": "object", - "required": [ - "desired" - ], "properties": { - "desired": { - "description": "desired is the name of the machine config that the the node should be upgraded to. This value is set when the machine config pool generates a new version of its rendered configuration. When this value is changed, the machine config daemon starts the node upgrade process. This value gets set in the machine config node spec once the machine config has been targeted for upgrade and before it is validated. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", - "type": "string", - "default": "" + "conditions": { + "description": "conditions represent the observations of a pinned image set's current state.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "MachineConfigNodeSpecMachineConfigVersion", + "Kind": "PinnedImageSetStatus", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeSpecPinnedImageSet": { + "io.openshift.machineconfiguration.v1alpha1.RenderedMachineConfigReference": { + "description": "Refers to the name of a rendered MachineConfig (e.g., \"rendered-worker-ec40d2965ff81bce7cd7a7e82a680739\", etc.): the build targets this MachineConfig, this is often used to tell us whether we need an update.", "type": "object", "required": [ "name" ], "properties": { "name": { - "description": "name is the name of the pinned image set. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", + "description": "name is the name of the rendered MachineConfig object.", "type": "string", "default": "" } @@ -39750,154 +44112,132 @@ "Type": "nested", "Group": "machineconfiguration.openshift.io", "Version": "v1alpha1", - "Kind": "MachineConfigNodeSpecPinnedImageSet", + "Kind": "RenderedMachineConfigReference", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatus": { - "description": "MachineConfigNodeStatus holds the reported information on a particular machine config node.", + "io.openshift.monitoring.v1.AlertRelabelConfig": { + "description": "AlertRelabelConfig defines a set of relabel configs for alerts.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "configVersion" + "spec" ], "properties": { - "conditions": { - "description": "conditions represent the observations of a machine config node's current state.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "configVersion": { - "description": "configVersion describes the current and desired machine config for this node. The current version represents the current machine config for the node and is updated after a successful update. The desired version represents the machine config the node will attempt to update to. This desired machine config has been compared to the current machine config and has been validated by the machine config operator as one that is valid and that exists.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusMachineConfigVersion" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "observedGeneration": { - "description": "observedGeneration represents the generation observed by the controller. This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.", - "type": "integer", - "format": "int64" + "spec": { + "description": "spec describes the desired state of this AlertRelabelConfig object.", + "default": {}, + "$ref": "#/definitions/io.openshift.monitoring.v1.AlertRelabelConfigSpec" }, - "pinnedImageSets": { - "description": "pinnedImageSets describes the current and desired pinned image sets for this node. The current version is the generation of the pinned image set that has most recently been successfully pulled and pinned on this node. The desired version is the generation of the pinned image set that is targeted to be pulled and pinned on this node.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusPinnedImageSet" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "status": { + "description": "status describes the current state of this AlertRelabelConfig object.", + "default": {}, + "$ref": "#/definitions/io.openshift.monitoring.v1.AlertRelabelConfigStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineConfigNodeStatus", + "Type": "object", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertRelabelConfig", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusMachineConfigVersion": { - "description": "MachineConfigNodeStatusMachineConfigVersion holds the current and desired config versions as last updated in the MCN status. When the current and desired versions are not matched, the machine config pool is processing an upgrade and the machine config node will monitor the upgrade process. When the current and desired versions do not match, the machine config node will ignore these events given that certain operations happen both during the MCO's upgrade mode and the daily operations mode.", + "io.openshift.monitoring.v1.AlertRelabelConfigList": { + "description": "AlertRelabelConfigList is a list of AlertRelabelConfigs.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "desired" + "items" ], "properties": { - "current": { - "description": "current is the name of the machine config currently in use on the node. This value is updated once the machine config daemon has completed the update of the configuration for the node. This value should match the desired version unless an upgrade is in progress. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "desired": { - "description": "desired is the MachineConfig the node wants to upgrade to. This value gets set in the machine config node status once the machine config has been validated against the current machine config. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", - "type": "string", - "default": "" + "items": { + "description": "items is a list of AlertRelabelConfigs.", + "type": "array", + "items": { + "$ref": "#/definitions/io.openshift.monitoring.v1.AlertRelabelConfig" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineConfigNodeStatusMachineConfigVersion", + "Type": "list", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertRelabelConfigList", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigNodeStatusPinnedImageSet": { + "io.openshift.monitoring.v1.AlertRelabelConfigSpec": { + "description": "AlertRelabelConfigsSpec is the desired state of an AlertRelabelConfig resource.", "type": "object", "required": [ - "name" + "configs" ], "properties": { - "currentGeneration": { - "description": "currentGeneration is the generation of the pinned image set that has most recently been successfully pulled and pinned on this node.", - "type": "integer", - "format": "int32" - }, - "desiredGeneration": { - "description": "desiredGeneration version is the generation of the pinned image set that is targeted to be pulled and pinned on this node.", - "type": "integer", - "format": "int32" - }, - "lastFailedGeneration": { - "description": "lastFailedGeneration is the generation of the most recent pinned image set that failed to be pulled and pinned on this node.", - "type": "integer", - "format": "int32" - }, - "lastFailedGenerationErrors": { - "description": "lastFailedGenerationErrors is a list of errors why the lastFailed generation failed to be pulled and pinned.", + "configs": { + "description": "configs is a list of sequentially evaluated alert relabel configs.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.monitoring.v1.RelabelConfig" } - }, - "name": { - "description": "name is the name of the pinned image set. Must be a lowercase RFC-1123 hostname (https://tools.ietf.org/html/rfc1123) It may consist of only alphanumeric characters, hyphens (-) and periods (.) and must be at most 253 characters in length.", - "type": "string", - "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineConfigNodeStatusPinnedImageSet", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertRelabelConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineConfigPoolReference": { - "description": "Refers to the name of a MachineConfigPool (e.g., \"worker\", \"infra\", etc.): the MachineOSBuilder pod validates that the user has provided a valid pool", + "io.openshift.monitoring.v1.AlertRelabelConfigStatus": { + "description": "AlertRelabelConfigStatus is the status of an AlertRelabelConfig resource.", "type": "object", - "required": [ - "name" - ], "properties": { - "name": { - "description": "name of the MachineConfigPool object.", - "type": "string", - "default": "" + "conditions": { + "description": "conditions contains details on the state of the AlertRelabelConfig, may be empty.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineConfigPoolReference", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertRelabelConfigStatus", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSBuild": { - "description": "MachineOSBuild describes a build process managed and deployed by the MCO Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.monitoring.v1.AlertingRule": { + "description": "AlertingRule represents a set of user-defined Prometheus rule groups containing alerting rules. This resource is the supported method for cluster admins to create alerts based on metrics recorded by the platform monitoring stack in OpenShift, i.e. the Prometheus instance deployed to the openshift-monitoring namespace. You might use this to create custom alerting rules not shipped with OpenShift based on metrics from components such as the node_exporter, which provides machine-level metrics such as CPU usage, or kube-state-metrics, which provides metrics on Kubernetes usage.\n\nThe API is mostly compatible with the upstream PrometheusRule type from the prometheus-operator. The primary difference being that recording rules are not allowed here -- only alerting rules. For each AlertingRule resource created, a corresponding PrometheusRule will be created in the openshift-monitoring namespace. OpenShift requires admins to use the AlertingRule resource rather than the upstream type in order to allow better OpenShift specific defaulting and validation, while not modifying the upstream APIs directly.\n\nYou can find upstream API documentation for PrometheusRule resources here:\n\nhttps://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -39912,33 +44252,33 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec describes the configuration of the machine os build", + "description": "spec describes the desired state of this AlertingRule object.", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuildSpec" + "$ref": "#/definitions/io.openshift.monitoring.v1.AlertingRuleSpec" }, "status": { - "description": "status describes the lst observed state of this machine os build", + "description": "status describes the current state of this AlertOverrides object.", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuildStatus" + "$ref": "#/definitions/io.openshift.monitoring.v1.AlertingRuleStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSBuild", - "Scope": "Clustered" + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertingRule", + "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSBuildList": { - "description": "MachineOSBuildList describes all of the Builds on the system\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.monitoring.v1.AlertingRuleList": { + "description": "AlertingRuleList is a list of AlertingRule objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "items" ], "properties": { @@ -39947,10 +44287,11 @@ "type": "string" }, "items": { + "description": "items is a list of AlertingRule objects.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuild" + "$ref": "#/definitions/io.openshift.monitoring.v1.AlertingRule" } }, "kind": { @@ -39958,154 +44299,220 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "list", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSBuildList", + "Type": "list", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertingRuleList", + "Scope": "Namespaced" + } + }, + "io.openshift.monitoring.v1.AlertingRuleSpec": { + "description": "AlertingRuleSpec is the desired state of an AlertingRule resource.", + "type": "object", + "required": [ + "groups" + ], + "properties": { + "groups": { + "description": "groups is a list of grouped alerting rules. Rule groups are the unit at which Prometheus parallelizes rule processing. All rules in a single group share a configured evaluation interval. All rules in the group will be processed together on this interval, sequentially, and all rules will be processed.\n\nIt's common to group related alerting rules into a single AlertingRule resources, and within that resource, closely related alerts, or simply alerts with the same interval, into individual groups. You are also free to create AlertingRule resources with only a single rule group, but be aware that this can have a performance impact on Prometheus if the group is extremely large or has very complex query expressions to evaluate. Spreading very complex rules across multiple groups to allow them to be processed in parallel is also a common use-case.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.monitoring.v1.RuleGroup" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertingRuleSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.monitoring.v1.AlertingRuleStatus": { + "description": "AlertingRuleStatus is the status of an AlertingRule resource.", + "type": "object", + "properties": { + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with.", + "type": "integer", + "format": "int64" + }, + "prometheusRule": { + "description": "prometheusRule is the generated PrometheusRule for this AlertingRule. Each AlertingRule instance results in a generated PrometheusRule object in the same namespace, which is always the openshift-monitoring namespace.", + "default": {}, + "$ref": "#/definitions/io.openshift.monitoring.v1.PrometheusRuleRef" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "AlertingRuleStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.monitoring.v1.PrometheusRuleRef": { + "description": "PrometheusRuleRef is a reference to an existing PrometheusRule object. Each AlertingRule instance results in a generated PrometheusRule object in the same namespace, which is always the openshift-monitoring namespace. This is used to point to the generated PrometheusRule object in the AlertingRule status.", + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "description": "name of the referenced PrometheusRule.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "PrometheusRuleRef", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSBuildSpec": { - "description": "MachineOSBuildSpec describes information about a build process primarily populated from a MachineOSConfig object.", + "io.openshift.monitoring.v1.RelabelConfig": { + "description": "RelabelConfig allows dynamic rewriting of label sets for alerts. See Prometheus documentation: - https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs - https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config", "type": "object", - "required": [ - "configGeneration", - "desiredConfig", - "machineOSConfig", - "version", - "renderedImagePushspec" - ], "properties": { - "configGeneration": { - "description": "configGeneration tracks which version of MachineOSConfig this build is based off of", + "action": { + "description": "action to perform based on regex matching. Must be one of: 'Replace', 'Keep', 'Drop', 'HashMod', 'LabelMap', 'LabelDrop', or 'LabelKeep'. Default is: 'Replace'", + "type": "string" + }, + "modulus": { + "description": "modulus to take of the hash of the source label values. This can be combined with the 'HashMod' action to set 'target_label' to the 'modulus' of a hash of the concatenated 'source_labels'. This is only valid if sourceLabels is not empty and action is not 'LabelKeep' or 'LabelDrop'.", "type": "integer", - "format": "int64", - "default": 0 + "format": "int64" }, - "desiredConfig": { - "description": "desiredConfig is the desired config we want to build an image for.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.RenderedMachineConfigReference" + "regex": { + "description": "regex against which the extracted value is matched. Default is: '(.*)' regex is required for all actions except 'HashMod'", + "type": "string" }, - "machineOSConfig": { - "description": "machineOSConfig is the config object which the build is based off of", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfigReference" + "replacement": { + "description": "replacement value against which a regex replace is performed if the regular expression matches. This is required if the action is 'Replace' or 'LabelMap' and forbidden for actions 'LabelKeep' and 'LabelDrop'. Regex capture groups are available. Default is: '$1'", + "type": "string" }, - "renderedImagePushspec": { - "description": "renderedImagePushspec is set from the MachineOSConfig The format of the image pullspec is: host[:port][/namespace]/name:\u003ctag\u003e or svc_name.namespace.svc[:port]/repository/name:\u003ctag\u003e", - "type": "string", - "default": "" + "separator": { + "description": "separator placed between concatenated source label values. When omitted, Prometheus will use its default value of ';'.", + "type": "string" }, - "version": { - "description": "version tracks the newest MachineOSBuild for each MachineOSConfig", - "type": "integer", - "format": "int64", - "default": 0 + "sourceLabels": { + "description": "sourceLabels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the 'Replace', 'Keep', and 'Drop' actions. Not allowed for actions 'LabelKeep' and 'LabelDrop'.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "targetLabel": { + "description": "targetLabel to which the resulting value is written in a 'Replace' action. It is required for 'Replace' and 'HashMod' actions and forbidden for actions 'LabelKeep' and 'LabelDrop'. Regex capture groups are available.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSBuildSpec", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "RelabelConfig", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSBuildStatus": { - "description": "MachineOSBuildStatus describes the state of a build and other helpful information.", + "io.openshift.monitoring.v1.Rule": { + "description": "Rule describes an alerting rule. See Prometheus documentation: - https://www.prometheus.io/docs/prometheus/latest/configuration/alerting_rules", "type": "object", "required": [ - "buildStart" + "alert", + "expr" ], "properties": { - "buildEnd": { - "description": "buildEnd describes when the build ended.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "buildStart": { - "description": "buildStart describes when the build started.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "alert": { + "description": "alert is the name of the alert. Must be a valid label value, i.e. may contain any Unicode character.", + "type": "string", + "default": "" }, - "builderReference": { - "description": "ImageBuilderType describes the image builder set in the MachineOSConfig", - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSBuilderReference" + "annotations": { + "description": "annotations to add to each alert. These are values that can be used to store longer additional information that you won't query on, such as alert descriptions or runbook links.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } }, - "conditions": { - "description": "conditions are state related conditions for the build. Valid types are: Prepared, Building, Failed, Interrupted, and Succeeded once a Build is marked as Failed, no future conditions can be set. This is enforced by the MCO.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "expr": { + "description": "expr is the PromQL expression to evaluate. Every evaluation cycle this is evaluated at the current time, and all resultant time series become pending or firing alerts. This is most often a string representing a PromQL expression, e.g.: mapi_current_pending_csr \u003e mapi_max_pending_csr In rare cases this could be a simple integer, e.g. a simple \"1\" if the intent is to create an alert that is always firing. This is sometimes used to create an always-firing \"Watchdog\" alert in order to ensure the alerting pipeline is functional.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" }, - "finalImagePullspec": { - "description": "finalImagePushSpec describes the fully qualified pushspec produced by this build that the final image can be. Must be in sha format.", + "for": { + "description": "for is the time period after which alerts are considered firing after first returning results. Alerts which have not yet fired for long enough are considered pending.", "type": "string" }, - "relatedObjects": { - "description": "relatedObjects is a list of objects that are related to the build process.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ObjectReference" + "labels": { + "description": "labels to add or overwrite for each alert. The results of the PromQL expression for the alert will result in an existing set of labels for the alert, after evaluating the expression, for any label specified here with the same name as a label in that set, the label here wins and overwrites the previous value. These should typically be short identifying values that may be useful to query against. A common example is the alert severity, where one sets `severity: warning` under the `labels` key:", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" } } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSBuildStatus", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "Rule", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSBuilderReference": { - "description": "MachineOSBuilderReference describes which ImageBuilder backend to use for this build/", + "io.openshift.monitoring.v1.RuleGroup": { + "description": "RuleGroup is a list of sequentially evaluated alerting rules.", "type": "object", "required": [ - "imageBuilderType" + "name", + "rules" ], "properties": { - "buildPod": { - "description": "relatedObjects is a list of objects that are related to the build process.", - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.ObjectReference" + "interval": { + "description": "interval is how often rules in the group are evaluated. If not specified, it defaults to the global.evaluation_interval configured in Prometheus, which itself defaults to 30 seconds. You can check if this value has been modified from the default on your cluster by inspecting the platform Prometheus configuration: The relevant field in that resource is: spec.evaluationInterval", + "type": "string" }, - "imageBuilderType": { - "description": "ImageBuilderType describes the image builder set in the MachineOSConfig", + "name": { + "description": "name is the name of the group.", "type": "string", "default": "" + }, + "rules": { + "description": "rules is a list of sequentially evaluated alerting rules. Prometheus may process rule groups in parallel, but rules within a single group are always processed sequentially, and all rules are processed.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.monitoring.v1.Rule" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSBuilderReference", + "Group": "monitoring.openshift.io", + "Version": "v1", + "Kind": "RuleGroup", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "imageBuilderType", - "fields-to-discriminateBy": { - "buildPod": "PodImageBuilder" - } - } - ] + } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSConfig": { - "description": "MachineOSConfig describes the configuration for a build process managed by the MCO Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.network.cloud.v1.CloudPrivateIPConfig": { + "description": "CloudPrivateIPConfig performs an assignment of a private IP address to the primary NIC associated with cloud VMs. This is done by specifying the IP and Kubernetes node which the IP should be assigned to. This CRD is intended to be used by the network plugin which manages the cluster network. The spec side represents the desired state requested by the network plugin, and the status side represents the current state that this CRD's controller has executed. No users will have permission to modify it, and if a cluster-admin decides to edit it for some reason, their changes will be overwritten the next time the network plugin reconciles the object. Note: the CR's name must specify the requested private IP address (can be IPv4 or IPv6).\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -40120,30 +44527,31 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec describes the configuration of the machineosconfig", + "description": "spec is the definition of the desired private IP request.", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfigSpec" + "$ref": "#/definitions/io.openshift.network.cloud.v1.CloudPrivateIPConfigSpec" }, "status": { - "description": "status describes the status of the machineosconfig", + "description": "status is the observed status of the desired private IP request. Read-only.", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfigStatus" + "$ref": "#/definitions/io.openshift.network.cloud.v1.CloudPrivateIPConfigStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSConfig", + "Group": "cloud.network.openshift.io", + "Version": "v1", + "Kind": "CloudPrivateIPConfig", "Scope": "Clustered" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigList": { - "description": "MachineOSConfigList describes all configurations for image builds on the system\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.network.cloud.v1.CloudPrivateIPConfigList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer). CloudPrivateIPConfigList is the list of CloudPrivateIPConfigList.", "type": "object", "required": [ "items" @@ -40154,10 +44562,11 @@ "type": "string" }, "items": { + "description": "List of CloudPrivateIPConfig.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineOSConfig" + "$ref": "#/definitions/io.openshift.network.cloud.v1.CloudPrivateIPConfig" } }, "kind": { @@ -40165,212 +44574,199 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { "Type": "list", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSConfigList", + "Group": "cloud.network.openshift.io", + "Version": "v1", + "Kind": "CloudPrivateIPConfigList", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigReference": { - "description": "MachineOSConfigReference refers to the MachineOSConfig this build is based off of", + "io.openshift.network.cloud.v1.CloudPrivateIPConfigSpec": { + "description": "CloudPrivateIPConfigSpec consists of a node name which the private IP should be assigned to.", "type": "object", - "required": [ - "name" - ], "properties": { - "name": { - "description": "name of the MachineOSConfig", + "node": { + "description": "node is the node name, as specified by the Kubernetes field: node.metadata.name", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSConfigReference", + "Group": "cloud.network.openshift.io", + "Version": "v1", + "Kind": "CloudPrivateIPConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigSpec": { - "description": "MachineOSConfigSpec describes user-configurable options as well as information about a build process.", + "io.openshift.network.cloud.v1.CloudPrivateIPConfigStatus": { + "description": "CloudPrivateIPConfigStatus specifies the node assignment together with its assignment condition.", "type": "object", "required": [ - "machineConfigPool", - "buildInputs" + "conditions" ], "properties": { - "buildInputs": { - "description": "buildInputs is where user input options for the build live", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.BuildInputs" - }, - "buildOutputs": { - "description": "buildOutputs is where user input options for the build live", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.BuildOutputs" + "conditions": { + "description": "condition is the assignment condition of the private IP and its status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + } }, - "machineConfigPool": { - "description": "machineConfigPool is the pool which the build is for", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.MachineConfigPoolReference" + "node": { + "description": "node is the node name, as specified by the Kubernetes field: node.metadata.name", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSConfigSpec", + "Group": "cloud.network.openshift.io", + "Version": "v1", + "Kind": "CloudPrivateIPConfigStatus", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSConfigStatus": { - "description": "MachineOSConfigStatus describes the status this config object and relates it to the builds associated with this MachineOSConfig", + "io.openshift.network.v1.ClusterNetwork": { + "description": "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "serviceNetwork", + "clusterNetworks" + ], "properties": { - "conditions": { - "description": "conditions are state related conditions for the config.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "clusterNetworks": { + "description": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addresses from.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "$ref": "#/definitions/io.openshift.network.v1.ClusterNetworkEntry" + } }, - "currentImagePullspec": { - "description": "currentImagePullspec is the fully qualified image pull spec used by the MCO to pull down the new OSImage. This must include sha256.", + "hostsubnetlength": { + "description": "HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods", + "type": "integer", + "format": "int64" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "observedGeneration": { - "description": "observedGeneration represents the generation observed by the controller. this field is updated when the user changes the configuration in BuildSettings or the MCP this object is associated with.", + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "mtu": { + "description": "MTU is the MTU for the overlay network. This should be 50 less than the MTU of the network connecting the nodes. It is normally autodetected by the cluster network operator.", "type": "integer", "format": "int64" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSConfigStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSContainerfile": { - "description": "MachineOSContainerfile contains all custom content the user wants built into the image", - "type": "object", - "required": [ - "content" - ], - "properties": { - "containerfileArch": { - "description": "containerfileArch describes the architecture this containerfile is to be built for this arch is optional. If the user does not specify an architecture, it is assumed that the content can be applied to all architectures, or in a single arch cluster: the only architecture.", - "type": "string", - "default": "" }, - "content": { - "description": "content is the custom content to be built", + "network": { + "description": "Network is a CIDR string specifying the global overlay network's L3 space", + "type": "string" + }, + "pluginName": { + "description": "PluginName is the name of the network plugin being used", + "type": "string" + }, + "serviceNetwork": { + "description": "ServiceNetwork is the CIDR range that Service IP addresses are allocated from", "type": "string", "default": "" + }, + "vxlanPort": { + "description": "VXLANPort sets the VXLAN destination port used by the cluster. It is set by the master configuration file on startup and cannot be edited manually. Valid values for VXLANPort are integers 1-65535 inclusive and if unset defaults to 4789. Changing VXLANPort allows users to resolve issues between openshift SDN and other software trying to use the same VXLAN destination port.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSContainerfile", - "Scope": "Namespaced" + "Type": "object", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "ClusterNetwork", + "Scope": "Clustered" } }, - "io.openshift.machineconfiguration.v1alpha1.MachineOSImageBuilder": { + "io.openshift.network.v1.ClusterNetworkEntry": { + "description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.", "type": "object", "required": [ - "imageBuilderType" + "CIDR", + "hostSubnetLength" ], "properties": { - "imageBuilderType": { - "description": "imageBuilderType specifies the backend to be used to build the image. Valid options are: PodImageBuilder", + "CIDR": { + "description": "CIDR defines the total range of a cluster networks address space.", "type": "string", "default": "" + }, + "hostSubnetLength": { + "description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.", + "type": "integer", + "format": "int64", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "MachineOSImageBuilder", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "ClusterNetworkEntry", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.ObjectReference": { - "description": "ObjectReference contains enough information to let you inspect or modify the referred object.", + "io.openshift.network.v1.ClusterNetworkList": { + "description": "ClusterNetworkList is a collection of ClusterNetworks\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "group", - "resource", - "name" + "items" ], "properties": { - "group": { - "description": "group of the referent.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "name": { - "description": "name of the referent.", - "type": "string", - "default": "" + "items": { + "description": "Items is the list of cluster networks", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.network.v1.ClusterNetwork" + } }, - "namespace": { - "description": "namespace of the referent.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "resource": { - "description": "resource of the referent.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "ObjectReference", - "Scope": "Namespaced" - } - }, - "io.openshift.machineconfiguration.v1alpha1.PinnedImageRef": { - "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "description": "name is an OCI Image referenced by digest.\n\nThe format of the image ref is: host[:port][/namespace]/name@sha256:\u003cdigest\u003e", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "PinnedImageRef", + "Type": "list", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "ClusterNetworkList", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.PinnedImageSet": { - "description": "PinnedImageSet describes a set of images that should be pinned by CRI-O and pulled to the nodes which are members of the declared MachineConfigPools.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.network.v1.EgressNetworkPolicy": { + "description": "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "spec" @@ -40385,33 +44781,28 @@ "type": "string" }, "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec describes the configuration of this pinned image set.", - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageSetSpec" - }, - "status": { - "description": "status describes the last observed state of this pinned image set.", + "description": "spec is the specification of the current egress network policy", "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageSetStatus" + "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicySpec" } }, "x-fabric8-info": { "Type": "object", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "PinnedImageSet", - "Scope": "Clustered" + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "EgressNetworkPolicy", + "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.PinnedImageSetList": { - "description": "PinnedImageSetList is a list of PinnedImageSet resources\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.network.v1.EgressNetworkPolicyList": { + "description": "EgressNetworkPolicyList is a collection of EgressNetworkPolicy\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "items" ], "properties": { @@ -40420,10 +44811,11 @@ "type": "string" }, "items": { + "description": "items is the list of policies", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageSet" + "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicy" } }, "kind": { @@ -40433,104 +44825,128 @@ "metadata": { "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "PinnedImageSetList", - "Scope": "Namespaced" - } - }, - "io.openshift.machineconfiguration.v1alpha1.PinnedImageSetSpec": { - "description": "PinnedImageSetSpec defines the desired state of a PinnedImageSet.", - "type": "object", - "required": [ - "pinnedImages" - ], - "properties": { - "pinnedImages": { - "description": "pinnedImages is a list of OCI Image referenced by digest that should be pinned and pre-loaded by the nodes of a MachineConfigPool. Translates into a new file inside the /etc/crio/crio.conf.d directory with content similar to this:\n\n pinned_images = [\n \"quay.io/openshift-release-dev/ocp-release@sha256:...\",\n \"quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...\",\n \"quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...\",\n ...\n ]\n\nThese image references should all be by digest, tags aren't allowed.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.machineconfiguration.v1alpha1.PinnedImageRef" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "PinnedImageSetSpec", + "Type": "list", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "EgressNetworkPolicyList", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.PinnedImageSetStatus": { - "description": "PinnedImageSetStatus describes the current state of a PinnedImageSet.", + "io.openshift.network.v1.EgressNetworkPolicyPeer": { + "description": "EgressNetworkPolicyPeer specifies a target to apply egress network policy to", "type": "object", "properties": { - "conditions": { - "description": "conditions represent the observations of a pinned image set's current state.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "cidrSelector": { + "description": "CIDRSelector is the CIDR range to allow/deny traffic to. If this is set, dnsName must be unset Ideally we would have liked to use the cidr openapi format for this property. But openshift-sdn only supports v4 while specifying the cidr format allows both v4 and v6 cidrs We are therefore using a regex pattern to validate instead.", + "type": "string" + }, + "dnsName": { + "description": "DNSName is the domain name to allow/deny traffic to. If this is set, cidrSelector must be unset", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "PinnedImageSetStatus", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "EgressNetworkPolicyPeer", "Scope": "Namespaced" } }, - "io.openshift.machineconfiguration.v1alpha1.RenderedMachineConfigReference": { - "description": "Refers to the name of a rendered MachineConfig (e.g., \"rendered-worker-ec40d2965ff81bce7cd7a7e82a680739\", etc.): the build targets this MachineConfig, this is often used to tell us whether we need an update.", + "io.openshift.network.v1.EgressNetworkPolicyRule": { + "description": "EgressNetworkPolicyRule contains a single egress network policy rule", "type": "object", "required": [ - "name" + "type", + "to" ], "properties": { - "name": { - "description": "name is the name of the rendered MachineConfig object.", + "to": { + "description": "to is the target that traffic is allowed/denied to", + "default": {}, + "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicyPeer" + }, + "type": { + "description": "type marks this as an \"Allow\" or \"Deny\" rule", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "machineconfiguration.openshift.io", - "Version": "v1alpha1", - "Kind": "RenderedMachineConfigReference", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "EgressNetworkPolicyRule", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.AlertRelabelConfig": { - "description": "AlertRelabelConfig defines a set of relabel configs for alerts.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.network.v1.EgressNetworkPolicySpec": { + "description": "EgressNetworkPolicySpec provides a list of policies on outgoing network traffic", "type": "object", "required": [ - "spec" + "egress" + ], + "properties": { + "egress": { + "description": "egress contains the list of egress policy rules", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicyRule" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "network.openshift.io", + "Version": "v1", + "Kind": "EgressNetworkPolicySpec", + "Scope": "Namespaced" + } + }, + "io.openshift.network.v1.HostSubnet": { + "description": "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "host", + "hostIP", + "subnet" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "egressCIDRs": { + "description": "EgressCIDRs is the list of CIDR ranges available for automatically assigning egress IPs to this node from. If this field is set then EgressIPs should be treated as read-only.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "egressIPs": { + "description": "EgressIPs is the list of automatic egress IP addresses currently hosted by this node. If EgressCIDRs is empty, this can be set by hand; if EgressCIDRs is set then the master will overwrite the value here with its own allocation of egress IPs.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "host": { + "description": "Host is the name of the node. (This is the same as the object's name, but both fields must be set.)", + "type": "string", + "default": "" + }, + "hostIP": { + "description": "HostIP is the IP address to be used as a VTEP by other nodes in the overlay network", + "type": "string", + "default": "" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" @@ -40540,27 +44956,22 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "spec": { - "description": "spec describes the desired state of this AlertRelabelConfig object.", - "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.AlertRelabelConfigSpec" - }, - "status": { - "description": "status describes the current state of this AlertRelabelConfig object.", - "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.AlertRelabelConfigStatus" + "subnet": { + "description": "Subnet is the CIDR range of the overlay network assigned to the node for its pods", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "object", - "Group": "monitoring.openshift.io", + "Group": "network.openshift.io", "Version": "v1", - "Kind": "AlertRelabelConfig", - "Scope": "Namespaced" + "Kind": "HostSubnet", + "Scope": "Clustered" } }, - "io.openshift.monitoring.v1.AlertRelabelConfigList": { - "description": "AlertRelabelConfigList is a list of AlertRelabelConfigs.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.network.v1.HostSubnetList": { + "description": "HostSubnetList is a collection of HostSubnets\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -40571,10 +44982,11 @@ "type": "string" }, "items": { - "description": "items is a list of AlertRelabelConfigs.", + "description": "Items is the list of host subnets", "type": "array", "items": { - "$ref": "#/definitions/io.openshift.monitoring.v1.AlertRelabelConfig" + "default": {}, + "$ref": "#/definitions/io.openshift.network.v1.HostSubnet" } }, "kind": { @@ -40582,66 +44994,107 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { "Type": "list", - "Group": "monitoring.openshift.io", + "Group": "network.openshift.io", "Version": "v1", - "Kind": "AlertRelabelConfigList", + "Kind": "HostSubnetList", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.AlertRelabelConfigSpec": { - "description": "AlertRelabelConfigsSpec is the desired state of an AlertRelabelConfig resource.", + "io.openshift.network.v1.NetNamespace": { + "description": "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "configs" + "netname", + "netid" ], "properties": { - "configs": { - "description": "configs is a list of sequentially evaluated alert relabel configs.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "egressIPs": { + "description": "EgressIPs is a list of reserved IPs that will be used as the source for external traffic coming from pods in this namespace. (If empty, external traffic will be masqueraded to Node IPs.)", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.RelabelConfig" + "type": "string", + "default": "" } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "netid": { + "description": "NetID is the network identifier of the network namespace assigned to each overlay network packet. This can be manipulated with the \"oc adm pod-network\" commands.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "netname": { + "description": "NetName is the name of the network namespace. (This is the same as the object's name, but both fields must be set.)", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "monitoring.openshift.io", + "Type": "object", + "Group": "network.openshift.io", "Version": "v1", - "Kind": "AlertRelabelConfigSpec", - "Scope": "Namespaced" + "Kind": "NetNamespace", + "Scope": "Clustered" } }, - "io.openshift.monitoring.v1.AlertRelabelConfigStatus": { - "description": "AlertRelabelConfigStatus is the status of an AlertRelabelConfig resource.", + "io.openshift.network.v1.NetNamespaceList": { + "description": "NetNamespaceList is a collection of NetNamespaces\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "items" + ], "properties": { - "conditions": { - "description": "conditions contains details on the state of the AlertRelabelConfig, may be empty.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items is the list of net namespaces", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + "$ref": "#/definitions/io.openshift.network.v1.NetNamespace" } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "monitoring.openshift.io", + "Type": "list", + "Group": "network.openshift.io", "Version": "v1", - "Kind": "AlertRelabelConfigStatus", + "Kind": "NetNamespaceList", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.AlertingRule": { - "description": "AlertingRule represents a set of user-defined Prometheus rule groups containing alerting rules. This resource is the supported method for cluster admins to create alerts based on metrics recorded by the platform monitoring stack in OpenShift, i.e. the Prometheus instance deployed to the openshift-monitoring namespace. You might use this to create custom alerting rules not shipped with OpenShift based on metrics from components such as the node_exporter, which provides machine-level metrics such as CPU usage, or kube-state-metrics, which provides metrics on Kubernetes usage.\n\nThe API is mostly compatible with the upstream PrometheusRule type from the prometheus-operator. The primary difference being that recording rules are not allowed here -- only alerting rules. For each AlertingRule resource created, a corresponding PrometheusRule will be created in the openshift-monitoring namespace. OpenShift requires admins to use the AlertingRule resource rather than the upstream type in order to allow better OpenShift specific defaulting and validation, while not modifying the upstream APIs directly.\n\nYou can find upstream API documentation for PrometheusRule resources here:\n\nhttps://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.network.v1alpha1.DNSNameResolver": { + "description": "DNSNameResolver stores the DNS name resolution information of a DNS name. It can be enabled by the TechPreviewNoUpgrade feature set. It can also be enabled by the feature gate DNSNameResolver when using CustomNoUpgrade feature set.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "spec" @@ -40661,26 +45114,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec describes the desired state of this AlertingRule object.", + "description": "spec is the specification of the desired behavior of the DNSNameResolver.", "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.AlertingRuleSpec" + "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverSpec" }, "status": { - "description": "status describes the current state of this AlertOverrides object.", + "description": "status is the most recently observed status of the DNSNameResolver.", "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.AlertingRuleStatus" + "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "AlertingRule", + "Group": "network.openshift.io", + "Version": "v1alpha1", + "Kind": "DNSNameResolver", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.AlertingRuleList": { - "description": "AlertingRuleList is a list of AlertingRule objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.network.v1alpha1.DNSNameResolverList": { + "description": "DNSNameResolverList contains a list of DNSNameResolvers.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "items" @@ -40691,11 +45144,11 @@ "type": "string" }, "items": { - "description": "items is a list of AlertingRule objects.", + "description": "items gives the list of DNSNameResolvers.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.AlertingRule" + "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolver" } }, "kind": { @@ -40703,243 +45156,216 @@ "type": "string" }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { "Type": "list", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "AlertingRuleList", + "Group": "network.openshift.io", + "Version": "v1alpha1", + "Kind": "DNSNameResolverList", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.AlertingRuleSpec": { - "description": "AlertingRuleSpec is the desired state of an AlertingRule resource.", + "io.openshift.network.v1alpha1.DNSNameResolverResolvedAddress": { + "description": "DNSNameResolverResolvedAddress describes the details of an IP address for a resolved DNS name.", "type": "object", "required": [ - "groups" + "ip", + "ttlSeconds", + "lastLookupTime" ], "properties": { - "groups": { - "description": "groups is a list of grouped alerting rules. Rule groups are the unit at which Prometheus parallelizes rule processing. All rules in a single group share a configured evaluation interval. All rules in the group will be processed together on this interval, sequentially, and all rules will be processed.\n\nIt's common to group related alerting rules into a single AlertingRule resources, and within that resource, closely related alerts, or simply alerts with the same interval, into individual groups. You are also free to create AlertingRule resources with only a single rule group, but be aware that this can have a performance impact on Prometheus if the group is extremely large or has very complex query expressions to evaluate. Spreading very complex rules across multiple groups to allow them to be processed in parallel is also a common use-case.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.RuleGroup" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "ip": { + "description": "ip is an IP address associated with the dnsName. The validity of the IP address expires after lastLookupTime + ttlSeconds. To refresh the information, a DNS lookup will be performed upon the expiration of the IP address's validity. If the information is not refreshed then it will be removed with a grace period after the expiration of the IP address's validity.", + "type": "string", + "default": "" + }, + "lastLookupTime": { + "description": "lastLookupTime is the timestamp when the last DNS lookup was completed successfully. The validity of the IP address expires after lastLookupTime + ttlSeconds. The value of this field will be updated to the current time on a successful DNS lookup. If the information is not refreshed then it will be removed with a grace period after the expiration of the IP address's validity.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "ttlSeconds": { + "description": "ttlSeconds is the time-to-live value of the IP address. The validity of the IP address expires after lastLookupTime + ttlSeconds. On a successful DNS lookup the value of this field will be updated with the current time-to-live value. If the information is not refreshed then it will be removed with a grace period after the expiration of the IP address's validity.", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "AlertingRuleSpec", + "Group": "network.openshift.io", + "Version": "v1alpha1", + "Kind": "DNSNameResolverResolvedAddress", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.AlertingRuleStatus": { - "description": "AlertingRuleStatus is the status of an AlertingRule resource.", + "io.openshift.network.v1alpha1.DNSNameResolverResolvedName": { + "description": "DNSNameResolverResolvedName describes the details of a resolved DNS name.", "type": "object", + "required": [ + "dnsName", + "resolvedAddresses" + ], "properties": { - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with.", + "conditions": { + "description": "conditions provide information about the state of the DNS name. Known .status.conditions.type is: \"Degraded\". \"Degraded\" is true when the last resolution failed for the DNS name, and false otherwise.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" + }, + "dnsName": { + "description": "dnsName is the resolved DNS name matching the name field of DNSNameResolverSpec. This field can store both regular and wildcard DNS names which match the spec.name field. When the spec.name field contains a regular DNS name, this field will store the same regular DNS name after it is successfully resolved. When the spec.name field contains a wildcard DNS name, each resolvedName.dnsName will store the regular DNS names which match the wildcard DNS name and have been successfully resolved. If the wildcard DNS name can also be successfully resolved, then this field will store the wildcard DNS name as well.", + "type": "string", + "default": "" + }, + "resolutionFailures": { + "description": "resolutionFailures keeps the count of how many consecutive times the DNS resolution failed for the dnsName. If the DNS resolution succeeds then the field will be set to zero. Upon every failure, the value of the field will be incremented by one. The details about the DNS name will be removed, if the value of resolutionFailures reaches 5 and the TTL of all the associated IP addresses have expired.", "type": "integer", - "format": "int64" + "format": "int32" }, - "prometheusRule": { - "description": "prometheusRule is the generated PrometheusRule for this AlertingRule. Each AlertingRule instance results in a generated PrometheusRule object in the same namespace, which is always the openshift-monitoring namespace.", - "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.PrometheusRuleRef" + "resolvedAddresses": { + "description": "resolvedAddresses gives the list of associated IP addresses and their corresponding TTLs and last lookup times for the dnsName.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverResolvedAddress" + }, + "x-kubernetes-list-map-keys": [ + "ip" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "AlertingRuleStatus", + "Group": "network.openshift.io", + "Version": "v1alpha1", + "Kind": "DNSNameResolverResolvedName", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.PrometheusRuleRef": { - "description": "PrometheusRuleRef is a reference to an existing PrometheusRule object. Each AlertingRule instance results in a generated PrometheusRule object in the same namespace, which is always the openshift-monitoring namespace. This is used to point to the generated PrometheusRule object in the AlertingRule status.", + "io.openshift.network.v1alpha1.DNSNameResolverSpec": { + "description": "DNSNameResolverSpec is a desired state description of DNSNameResolver.", "type": "object", "required": [ "name" ], "properties": { "name": { - "description": "name of the referenced PrometheusRule.", + "description": "name is the DNS name for which the DNS name resolution information will be stored. For a regular DNS name, only the DNS name resolution information of the regular DNS name will be stored. For a wildcard DNS name, the DNS name resolution information of all the DNS names that match the wildcard DNS name will be stored. For a wildcard DNS name, the '*' will match only one label. Additionally, only a single '*' can be used at the beginning of the wildcard DNS name. For example, '*.example.com.' will match 'sub1.example.com.' but won't match 'sub2.sub1.example.com.'", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "PrometheusRuleRef", + "Group": "network.openshift.io", + "Version": "v1alpha1", + "Kind": "DNSNameResolverSpec", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.RelabelConfig": { - "description": "RelabelConfig allows dynamic rewriting of label sets for alerts. See Prometheus documentation: - https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs - https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config", + "io.openshift.network.v1alpha1.DNSNameResolverStatus": { + "description": "DNSNameResolverStatus defines the observed status of DNSNameResolver.", "type": "object", "properties": { - "action": { - "description": "action to perform based on regex matching. Must be one of: 'Replace', 'Keep', 'Drop', 'HashMod', 'LabelMap', 'LabelDrop', or 'LabelKeep'. Default is: 'Replace'", - "type": "string" - }, - "modulus": { - "description": "modulus to take of the hash of the source label values. This can be combined with the 'HashMod' action to set 'target_label' to the 'modulus' of a hash of the concatenated 'source_labels'. This is only valid if sourceLabels is not empty and action is not 'LabelKeep' or 'LabelDrop'.", - "type": "integer", - "format": "int64" - }, - "regex": { - "description": "regex against which the extracted value is matched. Default is: '(.*)' regex is required for all actions except 'HashMod'", - "type": "string" - }, - "replacement": { - "description": "replacement value against which a regex replace is performed if the regular expression matches. This is required if the action is 'Replace' or 'LabelMap' and forbidden for actions 'LabelKeep' and 'LabelDrop'. Regex capture groups are available. Default is: '$1'", - "type": "string" - }, - "separator": { - "description": "separator placed between concatenated source label values. When omitted, Prometheus will use its default value of ';'.", - "type": "string" - }, - "sourceLabels": { - "description": "sourceLabels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the 'Replace', 'Keep', and 'Drop' actions. Not allowed for actions 'LabelKeep' and 'LabelDrop'.", + "resolvedNames": { + "description": "resolvedNames contains a list of matching DNS names and their corresponding IP addresses along with their TTL and last DNS lookup times.", "type": "array", "items": { - "type": "string", - "default": "" - } - }, - "targetLabel": { - "description": "targetLabel to which the resulting value is written in a 'Replace' action. It is required for 'Replace' and 'HashMod' actions and forbidden for actions 'LabelKeep' and 'LabelDrop'. Regex capture groups are available.", - "type": "string" + "default": {}, + "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverResolvedName" + }, + "x-kubernetes-list-map-keys": [ + "dnsName" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "dnsName", + "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { "Type": "nested", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "RelabelConfig", + "Group": "network.openshift.io", + "Version": "v1alpha1", + "Kind": "DNSNameResolverStatus", "Scope": "Namespaced" } }, - "io.openshift.monitoring.v1.Rule": { - "description": "Rule describes an alerting rule. See Prometheus documentation: - https://www.prometheus.io/docs/prometheus/latest/configuration/alerting_rules", + "io.openshift.oauth.v1.ClusterRoleScopeRestriction": { + "description": "ClusterRoleScopeRestriction describes restrictions on cluster role scopes", "type": "object", "required": [ - "alert", - "expr" + "roleNames", + "namespaces", + "allowEscalation" ], "properties": { - "alert": { - "description": "alert is the name of the alert. Must be a valid label value, i.e. may contain any Unicode character.", - "type": "string", - "default": "" - }, - "annotations": { - "description": "annotations to add to each alert. These are values that can be used to store longer additional information that you won't query on, such as alert descriptions or runbook links.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "expr": { - "description": "expr is the PromQL expression to evaluate. Every evaluation cycle this is evaluated at the current time, and all resultant time series become pending or firing alerts. This is most often a string representing a PromQL expression, e.g.: mapi_current_pending_csr \u003e mapi_max_pending_csr In rare cases this could be a simple integer, e.g. a simple \"1\" if the intent is to create an alert that is always firing. This is sometimes used to create an always-firing \"Watchdog\" alert in order to ensure the alerting pipeline is functional.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" - }, - "for": { - "description": "for is the time period after which alerts are considered firing after first returning results. Alerts which have not yet fired for long enough are considered pending.", - "type": "string" + "allowEscalation": { + "description": "AllowEscalation indicates whether you can request roles and their escalating resources", + "type": "boolean", + "default": false }, - "labels": { - "description": "labels to add or overwrite for each alert. The results of the PromQL expression for the alert will result in an existing set of labels for the alert, after evaluating the expression, for any label specified here with the same name as a label in that set, the label here wins and overwrites the previous value. These should typically be short identifying values that may be useful to query against. A common example is the alert severity, where one sets `severity: warning` under the `labels` key:", - "type": "object", - "additionalProperties": { + "namespaces": { + "description": "Namespaces is the list of namespaces that can be referenced. * means any of them (including *)", + "type": "array", + "items": { "type": "string", "default": "" } - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "monitoring.openshift.io", - "Version": "v1", - "Kind": "Rule", - "Scope": "Namespaced" - } - }, - "io.openshift.monitoring.v1.RuleGroup": { - "description": "RuleGroup is a list of sequentially evaluated alerting rules.", - "type": "object", - "required": [ - "name", - "rules" - ], - "properties": { - "interval": { - "description": "interval is how often rules in the group are evaluated. If not specified, it defaults to the global.evaluation_interval configured in Prometheus, which itself defaults to 30 seconds. You can check if this value has been modified from the default on your cluster by inspecting the platform Prometheus configuration: The relevant field in that resource is: spec.evaluationInterval", - "type": "string" - }, - "name": { - "description": "name is the name of the group.", - "type": "string", - "default": "" }, - "rules": { - "description": "rules is a list of sequentially evaluated alerting rules. Prometheus may process rule groups in parallel, but rules within a single group are always processed sequentially, and all rules are processed.", + "roleNames": { + "description": "RoleNames is the list of cluster roles that can referenced. * means anything", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.monitoring.v1.Rule" + "type": "string", + "default": "" } } }, "x-fabric8-info": { "Type": "nested", - "Group": "monitoring.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "RuleGroup", + "Kind": "ClusterRoleScopeRestriction", "Scope": "Namespaced" } }, - "io.openshift.network.v1.ClusterNetwork": { - "description": "ClusterNetwork was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthAccessToken": { + "description": "OAuthAccessToken describes an OAuth access token. The name of a token must be prefixed with a `sha256~` string, must not contain \"/\" or \"%\" characters and must be at least 32 characters long.\n\nThe name of the token is constructed from the actual token by sha256-hashing it and using URL-safe unpadded base64-encoding (as described in RFC4648) on the hashed result.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "serviceNetwork", - "clusterNetworks" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "clusterNetworks": { - "description": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addresses from.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.ClusterNetworkEntry" - } + "authorizeToken": { + "description": "AuthorizeToken contains the token that authorized this token", + "type": "string" + }, + "clientName": { + "description": "ClientName references the client that created this token.", + "type": "string" }, - "hostsubnetlength": { - "description": "HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods", + "expiresIn": { + "description": "ExpiresIn is the seconds from CreationTime before this token expires.", "type": "integer", "format": "int64" }, + "inactivityTimeoutSeconds": { + "description": "InactivityTimeoutSeconds is the value in seconds, from the CreationTimestamp, after which this token can no longer be used. The value is automatically incremented when the token is used.", + "type": "integer", + "format": "int32" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" @@ -40949,68 +45375,41 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "mtu": { - "description": "MTU is the MTU for the overlay network. This should be 50 less than the MTU of the network connecting the nodes. It is normally autodetected by the cluster network operator.", - "type": "integer", - "format": "int64" - }, - "network": { - "description": "Network is a CIDR string specifying the global overlay network's L3 space", + "redirectURI": { + "description": "RedirectURI is the redirection associated with the token.", "type": "string" }, - "pluginName": { - "description": "PluginName is the name of the network plugin being used", + "refreshToken": { + "description": "RefreshToken is the value by which this token can be renewed. Can be blank.", "type": "string" }, - "serviceNetwork": { - "description": "ServiceNetwork is the CIDR range that Service IP addresses are allocated from", - "type": "string", - "default": "" + "scopes": { + "description": "Scopes is an array of the requested scopes.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "vxlanPort": { - "description": "VXLANPort sets the VXLAN destination port used by the cluster. It is set by the master configuration file on startup and cannot be edited manually. Valid values for VXLANPort are integers 1-65535 inclusive and if unset defaults to 4789. Changing VXLANPort allows users to resolve issues between openshift SDN and other software trying to use the same VXLAN destination port.", - "type": "integer", - "format": "int64" + "userName": { + "description": "UserName is the user name associated with this token", + "type": "string" + }, + "userUID": { + "description": "UserUID is the unique UID associated with this token", + "type": "string" } }, "x-fabric8-info": { "Type": "object", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "ClusterNetwork", + "Kind": "OAuthAccessToken", "Scope": "Clustered" } }, - "io.openshift.network.v1.ClusterNetworkEntry": { - "description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.", - "type": "object", - "required": [ - "CIDR", - "hostSubnetLength" - ], - "properties": { - "CIDR": { - "description": "CIDR defines the total range of a cluster networks address space.", - "type": "string", - "default": "" - }, - "hostSubnetLength": { - "description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.", - "type": "integer", - "format": "int64", - "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "network.openshift.io", - "Version": "v1", - "Kind": "ClusterNetworkEntry", - "Scope": "Namespaced" - } - }, - "io.openshift.network.v1.ClusterNetworkList": { - "description": "ClusterNetworkList is a collection of ClusterNetworks\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthAccessTokenList": { + "description": "OAuthAccessTokenList is a collection of OAuth access tokens\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -41021,11 +45420,11 @@ "type": "string" }, "items": { - "description": "Items is the list of cluster networks", + "description": "Items is the list of OAuth access tokens", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.ClusterNetwork" + "$ref": "#/definitions/io.openshift.oauth.v1.OAuthAccessToken" } }, "kind": { @@ -41040,23 +45439,37 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "ClusterNetworkList", + "Kind": "OAuthAccessTokenList", "Scope": "Namespaced" } }, - "io.openshift.network.v1.EgressNetworkPolicy": { - "description": "EgressNetworkPolicy was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthAuthorizeToken": { + "description": "OAuthAuthorizeToken describes an OAuth authorization token\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "spec" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, + "clientName": { + "description": "ClientName references the client that created this token.", + "type": "string" + }, + "codeChallenge": { + "description": "CodeChallenge is the optional code_challenge associated with this authorization code, as described in rfc7636", + "type": "string" + }, + "codeChallengeMethod": { + "description": "CodeChallengeMethod is the optional code_challenge_method associated with this authorization code, as described in rfc7636", + "type": "string" + }, + "expiresIn": { + "description": "ExpiresIn is the seconds from CreationTime before this token expires.", + "type": "integer", + "format": "int64" + }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" @@ -41066,22 +45479,41 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "spec": { - "description": "spec is the specification of the current egress network policy", - "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicySpec" + "redirectURI": { + "description": "RedirectURI is the redirection associated with the token.", + "type": "string" + }, + "scopes": { + "description": "Scopes is an array of the requested scopes.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "state": { + "description": "State data from request", + "type": "string" + }, + "userName": { + "description": "UserName is the user name associated with this token", + "type": "string" + }, + "userUID": { + "description": "UserUID is the unique UID associated with this token. UserUID and UserName must both match for this token to be valid.", + "type": "string" } }, "x-fabric8-info": { "Type": "object", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "EgressNetworkPolicy", - "Scope": "Namespaced" + "Kind": "OAuthAuthorizeToken", + "Scope": "Clustered" } }, - "io.openshift.network.v1.EgressNetworkPolicyList": { - "description": "EgressNetworkPolicyList is a collection of EgressNetworkPolicy\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthAuthorizeTokenList": { + "description": "OAuthAuthorizeTokenList is a collection of OAuth authorization tokens\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -41092,11 +45524,11 @@ "type": "string" }, "items": { - "description": "items is the list of policies", + "description": "Items is the list of OAuth authorization tokens", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicy" + "$ref": "#/definitions/io.openshift.oauth.v1.OAuthAuthorizeToken" } }, "kind": { @@ -41111,148 +45543,170 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "EgressNetworkPolicyList", + "Kind": "OAuthAuthorizeTokenList", "Scope": "Namespaced" } }, - "io.openshift.network.v1.EgressNetworkPolicyPeer": { - "description": "EgressNetworkPolicyPeer specifies a target to apply egress network policy to", + "io.openshift.oauth.v1.OAuthClient": { + "description": "OAuthClient describes an OAuth client\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "properties": { - "cidrSelector": { - "description": "CIDRSelector is the CIDR range to allow/deny traffic to. If this is set, dnsName must be unset Ideally we would have liked to use the cidr openapi format for this property. But openshift-sdn only supports v4 while specifying the cidr format allows both v4 and v6 cidrs We are therefore using a regex pattern to validate instead.", + "accessTokenInactivityTimeoutSeconds": { + "description": "AccessTokenInactivityTimeoutSeconds overrides the default token inactivity timeout for tokens granted to this client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. This value needs to be set only if the default set in configuration is not appropriate for this client. Valid values are: - 0: Tokens for this client never time out - X: Tokens time out if there is no activity for X seconds The current minimum allowed value for X is 300 (5 minutes)\n\nWARNING: existing tokens' timeout will not be affected (lowered) by changing this value", + "type": "integer", + "format": "int32" + }, + "accessTokenMaxAgeSeconds": { + "description": "AccessTokenMaxAgeSeconds overrides the default access token max age for tokens granted to this client. 0 means no expiration.", + "type": "integer", + "format": "int32" + }, + "additionalSecrets": { + "description": "AdditionalSecrets holds other secrets that may be used to identify the client. This is useful for rotation and for service account token validation", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "dnsName": { - "description": "DNSName is the domain name to allow/deny traffic to. If this is set, cidrSelector must be unset", + "grantMethod": { + "description": "GrantMethod is a required field which determines how to handle grants for this client. Valid grant handling methods are:\n - auto: always approves grant requests, useful for trusted clients\n - prompt: prompts the end user for approval of grant requests, useful for third-party clients", "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "network.openshift.io", - "Version": "v1", - "Kind": "EgressNetworkPolicyPeer", - "Scope": "Namespaced" - } - }, - "io.openshift.network.v1.EgressNetworkPolicyRule": { - "description": "EgressNetworkPolicyRule contains a single egress network policy rule", - "type": "object", - "required": [ - "type", - "to" - ], - "properties": { - "to": { - "description": "to is the target that traffic is allowed/denied to", + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicyPeer" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "type": { - "description": "type marks this as an \"Allow\" or \"Deny\" rule", - "type": "string", - "default": "" + "redirectURIs": { + "description": "RedirectURIs is the valid redirection URIs associated with a client", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-patch-strategy": "merge" + }, + "respondWithChallenges": { + "description": "RespondWithChallenges indicates whether the client wants authentication needed responses made in the form of challenges instead of redirects", + "type": "boolean" + }, + "scopeRestrictions": { + "description": "ScopeRestrictions describes which scopes this client can request. Each requested scope is checked against each restriction. If any restriction matches, then the scope is allowed. If no restriction matches, then the scope is denied.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.oauth.v1.ScopeRestriction" + } + }, + "secret": { + "description": "Secret is the unique secret associated with a client", + "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "network.openshift.io", + "Type": "object", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "EgressNetworkPolicyRule", - "Scope": "Namespaced" + "Kind": "OAuthClient", + "Scope": "Clustered" } }, - "io.openshift.network.v1.EgressNetworkPolicySpec": { - "description": "EgressNetworkPolicySpec provides a list of policies on outgoing network traffic", + "io.openshift.oauth.v1.OAuthClientAuthorization": { + "description": "OAuthClientAuthorization describes an authorization created by an OAuth client\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "egress" - ], "properties": { - "egress": { - "description": "egress contains the list of egress policy rules", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "clientName": { + "description": "ClientName references the client that created this authorization", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "scopes": { + "description": "Scopes is an array of the granted scopes.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.EgressNetworkPolicyRule" + "type": "string", + "default": "" } + }, + "userName": { + "description": "UserName is the user name that authorized this client", + "type": "string" + }, + "userUID": { + "description": "UserUID is the unique UID associated with this authorization. UserUID and UserName must both match for this authorization to be valid.", + "type": "string" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "network.openshift.io", + "Type": "object", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "EgressNetworkPolicySpec", - "Scope": "Namespaced" + "Kind": "OAuthClientAuthorization", + "Scope": "Clustered" } }, - "io.openshift.network.v1.HostSubnet": { - "description": "HostSubnet was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthClientAuthorizationList": { + "description": "OAuthClientAuthorizationList is a collection of OAuth client authorizations\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "host", - "hostIP", - "subnet" + "items" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "egressCIDRs": { - "description": "EgressCIDRs is the list of CIDR ranges available for automatically assigning egress IPs to this node from. If this field is set then EgressIPs should be treated as read-only.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "egressIPs": { - "description": "EgressIPs is the list of automatic egress IP addresses currently hosted by this node. If EgressCIDRs is empty, this can be set by hand; if EgressCIDRs is set then the master will overwrite the value here with its own allocation of egress IPs.", + "items": { + "description": "Items is the list of OAuth client authorizations", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.oauth.v1.OAuthClientAuthorization" } }, - "host": { - "description": "Host is the name of the node. (This is the same as the object's name, but both fields must be set.)", - "type": "string", - "default": "" - }, - "hostIP": { - "description": "HostIP is the IP address to be used as a VTEP by other nodes in the overlay network", - "type": "string", - "default": "" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "subnet": { - "description": "Subnet is the CIDR range of the overlay network assigned to the node for its pods", - "type": "string", - "default": "" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "network.openshift.io", + "Type": "list", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "HostSubnet", - "Scope": "Clustered" + "Kind": "OAuthClientAuthorizationList", + "Scope": "Namespaced" } }, - "io.openshift.network.v1.HostSubnetList": { - "description": "HostSubnetList is a collection of HostSubnets\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthClientList": { + "description": "OAuthClientList is a collection of OAuth clients\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -41263,11 +45717,11 @@ "type": "string" }, "items": { - "description": "Items is the list of host subnets", + "description": "Items is the list of OAuth clients", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.HostSubnet" + "$ref": "#/definitions/io.openshift.oauth.v1.OAuthClient" } }, "kind": { @@ -41282,31 +45736,126 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "HostSubnetList", + "Kind": "OAuthClientList", "Scope": "Namespaced" } }, - "io.openshift.network.v1.NetNamespace": { - "description": "NetNamespace was used by OpenShift SDN. DEPRECATED: OpenShift SDN is no longer supported and this object is no longer used in any way by OpenShift.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.OAuthRedirectReference": { + "description": "OAuthRedirectReference is a reference to an OAuth redirect object.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "netname", - "netid" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "egressIPs": { - "description": "EgressIPs is a list of reserved IPs that will be used as the source for external traffic coming from pods in this namespace. (If empty, external traffic will be masqueraded to Node IPs.)", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "reference": { + "description": "The reference to an redirect object in the current namespace.", + "default": {}, + "$ref": "#/definitions/io.openshift.oauth.v1.RedirectReference" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "oauth.openshift.io", + "Version": "v1", + "Kind": "OAuthRedirectReference", + "Scope": "Namespaced" + } + }, + "io.openshift.oauth.v1.RedirectReference": { + "description": "RedirectReference specifies the target in the current namespace that resolves into redirect URIs. Only the 'Route' kind is currently allowed.", + "type": "object", + "required": [ + "group", + "kind", + "name" + ], + "properties": { + "group": { + "description": "The group of the target that is being referred to.", + "type": "string", + "default": "" + }, + "kind": { + "description": "The kind of the target that is being referred to. Currently, only 'Route' is allowed.", + "type": "string", + "default": "" + }, + "name": { + "description": "The name of the target that is being referred to. e.g. name of the Route.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "oauth.openshift.io", + "Version": "v1", + "Kind": "RedirectReference", + "Scope": "Namespaced" + } + }, + "io.openshift.oauth.v1.ScopeRestriction": { + "description": "ScopeRestriction describe one restriction on scopes. Exactly one option must be non-nil.", + "type": "object", + "properties": { + "clusterRole": { + "description": "ClusterRole describes a set of restrictions for cluster role scoping.", + "$ref": "#/definitions/io.openshift.oauth.v1.ClusterRoleScopeRestriction" + }, + "literals": { + "description": "ExactValues means the scope has to match a particular set of strings exactly", "type": "array", "items": { "type": "string", "default": "" } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "oauth.openshift.io", + "Version": "v1", + "Kind": "ScopeRestriction", + "Scope": "Namespaced" + } + }, + "io.openshift.oauth.v1.UserOAuthAccessToken": { + "description": "UserOAuthAccessToken is a virtual resource to mirror OAuthAccessTokens to the user the access token was issued for", + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "authorizeToken": { + "description": "AuthorizeToken contains the token that authorized this token", + "type": "string" + }, + "clientName": { + "description": "ClientName references the client that created this token.", + "type": "string" + }, + "expiresIn": { + "description": "ExpiresIn is the seconds from CreationTime before this token expires.", + "type": "integer", + "format": "int64" + }, + "inactivityTimeoutSeconds": { + "description": "InactivityTimeoutSeconds is the value in seconds, from the CreationTimestamp, after which this token can no longer be used. The value is automatically incremented when the token is used.", + "type": "integer", + "format": "int32" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", @@ -41317,28 +45866,41 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "netid": { - "description": "NetID is the network identifier of the network namespace assigned to each overlay network packet. This can be manipulated with the \"oc adm pod-network\" commands.", - "type": "integer", - "format": "int64", - "default": 0 + "redirectURI": { + "description": "RedirectURI is the redirection associated with the token.", + "type": "string" }, - "netname": { - "description": "NetName is the name of the network namespace. (This is the same as the object's name, but both fields must be set.)", - "type": "string", - "default": "" + "refreshToken": { + "description": "RefreshToken is the value by which this token can be renewed. Can be blank.", + "type": "string" + }, + "scopes": { + "description": "Scopes is an array of the requested scopes.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "userName": { + "description": "UserName is the user name associated with this token", + "type": "string" + }, + "userUID": { + "description": "UserUID is the unique UID associated with this token", + "type": "string" } }, "x-fabric8-info": { "Type": "object", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "NetNamespace", + "Kind": "UserOAuthAccessToken", "Scope": "Clustered" } }, - "io.openshift.network.v1.NetNamespaceList": { - "description": "NetNamespaceList is a collection of NetNamespaces\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.oauth.v1.UserOAuthAccessTokenList": { + "description": "UserOAuthAccessTokenList is a collection of access tokens issued on behalf of the requesting user\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -41349,11 +45911,10 @@ "type": "string" }, "items": { - "description": "Items is the list of net namespaces", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.network.v1.NetNamespace" + "$ref": "#/definitions/io.openshift.oauth.v1.UserOAuthAccessToken" } }, "kind": { @@ -41368,364 +45929,362 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "network.openshift.io", + "Group": "oauth.openshift.io", "Version": "v1", - "Kind": "NetNamespaceList", + "Kind": "UserOAuthAccessTokenList", "Scope": "Namespaced" } }, - "io.openshift.network.v1alpha1.DNSNameResolver": { - "description": "DNSNameResolver stores the DNS name resolution information of a DNS name. It can be enabled by the TechPreviewNoUpgrade feature set. It can also be enabled by the feature gate DNSNameResolver when using CustomNoUpgrade feature set.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.controlplane.v1alpha1.LogEntry": { + "description": "LogEntry records events", "type": "object", "required": [ - "spec" + "time", + "success" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "latency": { + "description": "Latency records how long the action mentioned in the entry took.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "message": { + "description": "Message explaining status in a human readable format.", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "reason": { + "description": "Reason for status in a machine readable format.", + "type": "string" }, - "spec": { - "description": "spec is the specification of the desired behavior of the DNSNameResolver.", - "default": {}, - "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverSpec" + "success": { + "description": "Success indicates if the log entry indicates a success or failure.", + "type": "boolean", + "default": false }, - "status": { - "description": "status is the most recently observed status of the DNSNameResolver.", + "time": { + "description": "Start time of check action.", "default": {}, - "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverStatus" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" } }, "x-fabric8-info": { - "Type": "object", - "Group": "network.openshift.io", + "Type": "nested", + "Group": "controlplane.operator.openshift.io", "Version": "v1alpha1", - "Kind": "DNSNameResolver", + "Kind": "LogEntry", "Scope": "Namespaced" } }, - "io.openshift.network.v1alpha1.DNSNameResolverList": { - "description": "DNSNameResolverList contains a list of DNSNameResolvers.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.controlplane.v1alpha1.OutageEntry": { + "description": "OutageEntry records time period of an outage", "type": "object", "required": [ - "items" + "start" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "end": { + "description": "End of outage detected", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "endLogs": { + "description": "EndLogs contains log entries related to the end of this outage. Should contain the success entry that resolved the outage and possibly a few of the failure log entries that preceded it.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.LogEntry" + } + }, + "message": { + "description": "Message summarizes outage details in a human readable format.", "type": "string" }, - "items": { - "description": "items gives the list of DNSNameResolvers.", + "start": { + "description": "Start of outage detected", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "startLogs": { + "description": "StartLogs contains log entries related to the start of this outage. Should contain the original failure, any entries where the failure mode changed.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolver" + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.LogEntry" } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "controlplane.operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OutageEntry", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheck": { + "description": "PodNetworkConnectivityCheck\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "metadata", + "spec" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "Spec defines the source and target of the connectivity check", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckSpec" + }, + "status": { + "description": "Status contains the observed status of the connectivity check", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckStatus" } }, "x-fabric8-info": { - "Type": "list", - "Group": "network.openshift.io", + "Type": "object", + "Group": "controlplane.operator.openshift.io", "Version": "v1alpha1", - "Kind": "DNSNameResolverList", + "Kind": "PodNetworkConnectivityCheck", "Scope": "Namespaced" } }, - "io.openshift.network.v1alpha1.DNSNameResolverResolvedAddress": { - "description": "DNSNameResolverResolvedAddress describes the details of an IP address for a resolved DNS name.", + "io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckCondition": { + "description": "PodNetworkConnectivityCheckCondition represents the overall status of the pod network connectivity.", "type": "object", "required": [ - "ip", - "ttlSeconds", - "lastLookupTime" + "type", + "status", + "lastTransitionTime" ], "properties": { - "ip": { - "description": "ip is an IP address associated with the dnsName. The validity of the IP address expires after lastLookupTime + ttlSeconds. To refresh the information, a DNS lookup will be performed upon the expiration of the IP address's validity. If the information is not refreshed then it will be removed with a grace period after the expiration of the IP address's validity.", + "lastTransitionTime": { + "description": "Last time the condition transitioned from one status to another.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "Message indicating details about last transition in a human readable format.", + "type": "string" + }, + "reason": { + "description": "Reason for the condition's last status transition in a machine readable format.", + "type": "string" + }, + "status": { + "description": "Status of the condition", "type": "string", "default": "" }, - "lastLookupTime": { - "description": "lastLookupTime is the timestamp when the last DNS lookup was completed successfully. The validity of the IP address expires after lastLookupTime + ttlSeconds. The value of this field will be updated to the current time on a successful DNS lookup. If the information is not refreshed then it will be removed with a grace period after the expiration of the IP address's validity.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "ttlSeconds": { - "description": "ttlSeconds is the time-to-live value of the IP address. The validity of the IP address expires after lastLookupTime + ttlSeconds. On a successful DNS lookup the value of this field will be updated with the current time-to-live value. If the information is not refreshed then it will be removed with a grace period after the expiration of the IP address's validity.", - "type": "integer", - "format": "int32", - "default": 0 + "type": { + "description": "Type of the condition", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "network.openshift.io", + "Group": "controlplane.operator.openshift.io", "Version": "v1alpha1", - "Kind": "DNSNameResolverResolvedAddress", + "Kind": "PodNetworkConnectivityCheckCondition", "Scope": "Namespaced" } }, - "io.openshift.network.v1alpha1.DNSNameResolverResolvedName": { - "description": "DNSNameResolverResolvedName describes the details of a resolved DNS name.", + "io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckList": { + "description": "PodNetworkConnectivityCheckList is a collection of PodNetworkConnectivityCheck\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "dnsName", - "resolvedAddresses" + "metadata", + "items" ], "properties": { - "conditions": { - "description": "conditions provide information about the state of the DNS name. Known .status.conditions.type is: \"Degraded\". \"Degraded\" is true when the last resolution failed for the DNS name, and false otherwise.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "dnsName": { - "description": "dnsName is the resolved DNS name matching the name field of DNSNameResolverSpec. This field can store both regular and wildcard DNS names which match the spec.name field. When the spec.name field contains a regular DNS name, this field will store the same regular DNS name after it is successfully resolved. When the spec.name field contains a wildcard DNS name, each resolvedName.dnsName will store the regular DNS names which match the wildcard DNS name and have been successfully resolved. If the wildcard DNS name can also be successfully resolved, then this field will store the wildcard DNS name as well.", - "type": "string", - "default": "" + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheck" + } }, - "resolutionFailures": { - "description": "resolutionFailures keeps the count of how many consecutive times the DNS resolution failed for the dnsName. If the DNS resolution succeeds then the field will be set to zero. Upon every failure, the value of the field will be incremented by one. The details about the DNS name will be removed, if the value of resolutionFailures reaches 5 and the TTL of all the associated IP addresses have expired.", - "type": "integer", - "format": "int32" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "resolvedAddresses": { - "description": "resolvedAddresses gives the list of associated IP addresses and their corresponding TTLs and last lookup times for the dnsName.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverResolvedAddress" - }, - "x-kubernetes-list-map-keys": [ - "ip" - ], - "x-kubernetes-list-type": "map" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "network.openshift.io", + "Type": "list", + "Group": "controlplane.operator.openshift.io", "Version": "v1alpha1", - "Kind": "DNSNameResolverResolvedName", + "Kind": "PodNetworkConnectivityCheckList", "Scope": "Namespaced" } }, - "io.openshift.network.v1alpha1.DNSNameResolverSpec": { - "description": "DNSNameResolverSpec is a desired state description of DNSNameResolver.", + "io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckSpec": { "type": "object", "required": [ - "name" + "sourcePod", + "targetEndpoint" ], "properties": { - "name": { - "description": "name is the DNS name for which the DNS name resolution information will be stored. For a regular DNS name, only the DNS name resolution information of the regular DNS name will be stored. For a wildcard DNS name, the DNS name resolution information of all the DNS names that match the wildcard DNS name will be stored. For a wildcard DNS name, the '*' will match only one label. Additionally, only a single '*' can be used at the beginning of the wildcard DNS name. For example, '*.example.com.' will match 'sub1.example.com.' but won't match 'sub2.sub1.example.com.'", + "sourcePod": { + "description": "SourcePod names the pod from which the condition will be checked", + "type": "string", + "default": "" + }, + "targetEndpoint": { + "description": "EndpointAddress to check. A TCP address of the form host:port. Note that if host is a DNS name, then the check would fail if the DNS name cannot be resolved. Specify an IP address for host to bypass DNS name lookup.", "type": "string", "default": "" + }, + "tlsClientCert": { + "description": "TLSClientCert, if specified, references a kubernetes.io/tls type secret with 'tls.crt' and 'tls.key' entries containing an optional TLS client certificate and key to be used when checking endpoints that require a client certificate in order to gracefully preform the scan without causing excessive logging in the endpoint process. The secret must exist in the same namespace as this resource.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" } }, "x-fabric8-info": { "Type": "nested", - "Group": "network.openshift.io", + "Group": "controlplane.operator.openshift.io", "Version": "v1alpha1", - "Kind": "DNSNameResolverSpec", + "Kind": "PodNetworkConnectivityCheckSpec", "Scope": "Namespaced" } }, - "io.openshift.network.v1alpha1.DNSNameResolverStatus": { - "description": "DNSNameResolverStatus defines the observed status of DNSNameResolver.", + "io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckStatus": { "type": "object", "properties": { - "resolvedNames": { - "description": "resolvedNames contains a list of matching DNS names and their corresponding IP addresses along with their TTL and last DNS lookup times.", + "conditions": { + "description": "Conditions summarize the status of the check", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.network.v1alpha1.DNSNameResolverResolvedName" + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckCondition" }, - "x-kubernetes-list-map-keys": [ - "dnsName" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "dnsName", + "x-kubernetes-patch-merge-key": "type", "x-kubernetes-patch-strategy": "merge" + }, + "failures": { + "description": "Failures contains logs of unsuccessful check actions", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.LogEntry" + } + }, + "outages": { + "description": "Outages contains logs of time periods of outages", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.OutageEntry" + } + }, + "successes": { + "description": "Successes contains logs successful check actions", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.controlplane.v1alpha1.LogEntry" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "network.openshift.io", + "Group": "controlplane.operator.openshift.io", "Version": "v1alpha1", - "Kind": "DNSNameResolverStatus", + "Kind": "PodNetworkConnectivityCheckStatus", "Scope": "Namespaced" } }, - "io.openshift.networkoperator.v1.EgressRouter": { - "description": "EgressRouter is a feature allowing the user to define an egress router that acts as a bridge between pods and external systems. The egress router runs a service that redirects egress traffic originating from a pod or a group of pods to a remote external system or multiple destinations as per configuration.\n\nIt is consumed by the cluster-network-operator. More specifically, given an EgressRouter CR with \u003cname\u003e, the CNO will create and manage: - A service called \u003cname\u003e - An egress pod called \u003cname\u003e - A NAD called \u003cname\u003e\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).\n\nEgressRouter is a single egressrouter pod configuration object.", + "io.openshift.operator.imageregistry.v1.AzureNetworkAccess": { + "description": "AzureNetworkAccess defines the network access properties for the storage account.", "type": "object", - "required": [ - "spec" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "internal": { + "description": "internal defines the vnet and subnet names to configure a private endpoint and connect it to the storage account in order to make it private. when type: Internal and internal is unset, the image registry operator will discover vnet and subnet names, and generate a private endpoint name.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.AzureNetworkAccessInternal" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": { + "description": "type is the network access level to be used for the storage account. type: Internal means the storage account will be private, type: External means the storage account will be publicly accessible. Internal storage accounts are only exposed within the cluster's vnet. External storage accounts are publicly exposed on the internet. When type: Internal is used, a vnetName, subNetName and privateEndpointName may optionally be specified. If unspecificed, the image registry operator will discover vnet and subnet names, and generate a privateEndpointName. Defaults to \"External\".", "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "Specification of the desired egress router.", - "default": {}, - "$ref": "#/definitions/io.openshift.networkoperator.v1.EgressRouterSpec" - }, - "status": { - "description": "Observed status of EgressRouter.", - "default": {}, - "$ref": "#/definitions/io.openshift.networkoperator.v1.EgressRouterStatus" } }, "x-fabric8-info": { - "Type": "object", - "Group": "network.operator.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "EgressRouter", + "Kind": "AzureNetworkAccess", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "internal": "Internal" + } + } + ] }, - "io.openshift.networkoperator.v1.EgressRouterSpec": { - "description": "EgressRouterSpec contains the configuration for an egress router. Mode, networkInterface and addresses fields must be specified along with exactly one \"Config\" that matches the mode. Each config consists of parameters specific to that mode.", + "io.openshift.operator.imageregistry.v1.AzureNetworkAccessInternal": { "type": "object", - "required": [ - "mode", - "networkInterface", - "addresses" - ], "properties": { - "addresses": { - "description": "List of IP addresses to configure on the pod's secondary interface.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.networkoperator.v1.EgressRouterAddress" - } + "networkResourceGroupName": { + "description": "networkResourceGroupName is the resource group name where the cluster's vnet and subnet are. When omitted, the registry operator will use the cluster resource group (from in the infrastructure status). If you set a networkResourceGroupName on your install-config.yaml, that value will be used automatically (for clusters configured with publish:Internal). Note that both vnet and subnet must be in the same resource group. It must be between 1 and 90 characters in length and must consist only of alphanumeric characters, hyphens (-), periods (.) and underscores (_), and not end with a period.", + "type": "string" }, - "mode": { - "description": "Mode depicts the mode that is used for the egress router. The default mode is \"Redirect\" and is the only supported mode currently.", - "type": "string", - "default": "" + "privateEndpointName": { + "description": "privateEndpointName is the name of the private endpoint for the registry. When provided, the registry will use it as the name of the private endpoint it will create for the storage account. When omitted, the registry will generate one. It must be between 2 and 64 characters in length and must consist only of alphanumeric characters, hyphens (-), periods (.) and underscores (_). It must start with an alphanumeric character and end with an alphanumeric character or an underscore.", + "type": "string" }, - "networkInterface": { - "description": "Specification of interface to create/use. The default is macvlan. Currently only macvlan is supported.", - "default": {}, - "$ref": "#/definitions/io.openshift.networkoperator.v1.EgressRouterInterface" + "subnetName": { + "description": "subnetName is the name of the subnet the registry operates in. When omitted, the registry operator will discover and set this by using the `kubernetes.io_cluster.\u003ccluster-id\u003e` tag in the vnet resource, then using one of listed subnets. Advanced cluster network configurations that use network security groups to protect subnets should ensure the provided subnetName has access to Azure Storage service. It must be between 1 and 80 characters in length and must consist only of alphanumeric characters, hyphens (-), periods (.) and underscores (_).", + "type": "string" }, - "redirect": { - "description": "Redirect represents the configuration parameters specific to redirect mode.", - "$ref": "#/definitions/io.openshift.networkoperator.v1.RedirectConfig" + "vnetName": { + "description": "vnetName is the name of the vnet the registry operates in. When omitted, the registry operator will discover and set this by using the `kubernetes.io_cluster.\u003ccluster-id\u003e` tag in the vnet resource. This tag is set automatically by the installer. Commonly, this will be the same vnet as the cluster. Advanced cluster network configurations should ensure the provided vnetName is the vnet of the nodes where the image registry pods are running from. It must be between 2 and 64 characters in length and must consist only of alphanumeric characters, hyphens (-), periods (.) and underscores (_). It must start with an alphanumeric character and end with an alphanumeric character or an underscore.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "network.operator.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "EgressRouterSpec", + "Kind": "AzureNetworkAccessInternal", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.ClusterRoleScopeRestriction": { - "description": "ClusterRoleScopeRestriction describes restrictions on cluster role scopes", + "io.openshift.operator.imageregistry.v1.Config": { + "description": "Config is the configuration object for a registry instance managed by the registry operator\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "roleNames", - "namespaces", - "allowEscalation" + "metadata", + "spec" ], - "properties": { - "allowEscalation": { - "description": "AllowEscalation indicates whether you can request roles and their escalating resources", - "type": "boolean", - "default": false - }, - "namespaces": { - "description": "Namespaces is the list of namespaces that can be referenced. * means any of them (including *)", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "roleNames": { - "description": "RoleNames is the list of cluster roles that can referenced. * means anything", - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "oauth.openshift.io", - "Version": "v1", - "Kind": "ClusterRoleScopeRestriction", - "Scope": "Namespaced" - } - }, - "io.openshift.oauth.v1.OAuthAccessToken": { - "description": "OAuthAccessToken describes an OAuth access token. The name of a token must be prefixed with a `sha256~` string, must not contain \"/\" or \"%\" characters and must be at least 32 characters long.\n\nThe name of the token is constructed from the actual token by sha256-hashing it and using URL-safe unpadded base64-encoding (as described in RFC4648) on the hashed result.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "authorizeToken": { - "description": "AuthorizeToken contains the token that authorized this token", - "type": "string" - }, - "clientName": { - "description": "ClientName references the client that created this token.", - "type": "string" - }, - "expiresIn": { - "description": "ExpiresIn is the seconds from CreationTime before this token expires.", - "type": "integer", - "format": "int64" - }, - "inactivityTimeoutSeconds": { - "description": "InactivityTimeoutSeconds is the value in seconds, from the CreationTimestamp, after which this token can no longer be used. The value is automatically incremented when the token is used.", - "type": "integer", - "format": "int32" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" @@ -41735,43 +46294,28 @@ "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "redirectURI": { - "description": "RedirectURI is the redirection associated with the token.", - "type": "string" - }, - "refreshToken": { - "description": "RefreshToken is the value by which this token can be renewed. Can be blank.", - "type": "string" - }, - "scopes": { - "description": "Scopes is an array of the requested scopes.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "userName": { - "description": "UserName is the user name associated with this token", - "type": "string" + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistrySpec" }, - "userUID": { - "description": "UserUID is the unique UID associated with this token", - "type": "string" + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "oauth.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthAccessToken", + "Kind": "Config", "Scope": "Clustered" } }, - "io.openshift.oauth.v1.OAuthAccessTokenList": { - "description": "OAuthAccessTokenList is a collection of OAuth access tokens\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ConfigList": { + "description": "ConfigList is a slice of Config objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -41780,11 +46324,10 @@ "type": "string" }, "items": { - "description": "Items is the list of OAuth access tokens", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.OAuthAccessToken" + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.Config" } }, "kind": { @@ -41799,83 +46342,77 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "oauth.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthAccessTokenList", + "Kind": "ConfigList", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.OAuthAuthorizeToken": { - "description": "OAuthAuthorizeToken describes an OAuth authorization token\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.EncryptionAlibaba": { + "description": "EncryptionAlibaba this a union type in kube parlance. Depending on the value for the AlibabaEncryptionMethod, different pointers may be used", + "type": "object", + "properties": { + "kms": { + "description": "KMS (key management service) is an encryption type that holds the struct for KMS KeyID", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.KMSEncryptionAlibaba" + }, + "method": { + "description": "Method defines the different encrytion modes available Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `AES256`.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", + "Version": "v1", + "Kind": "EncryptionAlibaba", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.imageregistry.v1.ImagePruner": { + "description": "ImagePruner is the configuration object for an image registry pruner managed by the registry operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "metadata", + "spec" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "clientName": { - "description": "ClientName references the client that created this token.", - "type": "string" - }, - "codeChallenge": { - "description": "CodeChallenge is the optional code_challenge associated with this authorization code, as described in rfc7636", - "type": "string" - }, - "codeChallengeMethod": { - "description": "CodeChallengeMethod is the optional code_challenge_method associated with this authorization code, as described in rfc7636", - "type": "string" - }, - "expiresIn": { - "description": "ExpiresIn is the seconds from CreationTime before this token expires.", - "type": "integer", - "format": "int64" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "redirectURI": { - "description": "RedirectURI is the redirection associated with the token.", - "type": "string" - }, - "scopes": { - "description": "Scopes is an array of the requested scopes.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "state": { - "description": "State data from request", - "type": "string" - }, - "userName": { - "description": "UserName is the user name associated with this token", - "type": "string" - }, - "userUID": { - "description": "UserUID is the unique UID associated with this token. UserUID and UserName must both match for this token to be valid.", - "type": "string" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImagePrunerSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImagePrunerStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "oauth.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthAuthorizeToken", + "Kind": "ImagePruner", "Scope": "Clustered" } }, - "io.openshift.oauth.v1.OAuthAuthorizeTokenList": { - "description": "OAuthAuthorizeTokenList is a collection of OAuth authorization tokens\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImagePrunerList": { + "description": "ImagePrunerList is a slice of ImagePruner objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -41884,11 +46421,10 @@ "type": "string" }, "items": { - "description": "Items is the list of OAuth authorization tokens", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.OAuthAuthorizeToken" + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImagePruner" } }, "kind": { @@ -41903,1400 +46439,1563 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "oauth.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthAuthorizeTokenList", + "Kind": "ImagePrunerList", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.OAuthClient": { - "description": "OAuthClient describes an OAuth client\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImagePrunerSpec": { + "description": "ImagePrunerSpec defines the specs for the running image pruner.", "type": "object", "properties": { - "accessTokenInactivityTimeoutSeconds": { - "description": "AccessTokenInactivityTimeoutSeconds overrides the default token inactivity timeout for tokens granted to this client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. This value needs to be set only if the default set in configuration is not appropriate for this client. Valid values are: - 0: Tokens for this client never time out - X: Tokens time out if there is no activity for X seconds The current minimum allowed value for X is 300 (5 minutes)\n\nWARNING: existing tokens' timeout will not be affected (lowered) by changing this value", + "affinity": { + "description": "affinity is a group of node affinity scheduling rules for the image pruner pod.", + "$ref": "#/definitions/io.k8s.api.core.v1.Affinity" + }, + "failedJobsHistoryLimit": { + "description": "failedJobsHistoryLimit specifies how many failed image pruner jobs to retain. Defaults to 3 if not set.", "type": "integer", "format": "int32" }, - "accessTokenMaxAgeSeconds": { - "description": "AccessTokenMaxAgeSeconds overrides the default access token max age for tokens granted to this client. 0 means no expiration.", + "ignoreInvalidImageReferences": { + "description": "ignoreInvalidImageReferences indicates whether the pruner can ignore errors while parsing image references.", + "type": "boolean" + }, + "keepTagRevisions": { + "description": "keepTagRevisions specifies the number of image revisions for a tag in an image stream that will be preserved. Defaults to 3.", "type": "integer", "format": "int32" }, - "additionalSecrets": { - "description": "AdditionalSecrets holds other secrets that may be used to identify the client. This is useful for rotation and for service account token validation", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "keepYoungerThan": { + "description": "keepYoungerThan specifies the minimum age in nanoseconds of an image and its referrers for it to be considered a candidate for pruning. DEPRECATED: This field is deprecated in favor of keepYoungerThanDuration. If both are set, this field is ignored and keepYoungerThanDuration takes precedence.", + "type": "integer", + "format": "int64" }, - "grantMethod": { - "description": "GrantMethod is a required field which determines how to handle grants for this client. Valid grant handling methods are:\n - auto: always approves grant requests, useful for trusted clients\n - prompt: prompts the end user for approval of grant requests, useful for third-party clients", - "type": "string" + "keepYoungerThanDuration": { + "description": "keepYoungerThanDuration specifies the minimum age of an image and its referrers for it to be considered a candidate for pruning. Defaults to 60m (60 minutes).", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "logLevel": { + "description": "logLevel sets the level of log output for the pruner job.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "redirectURIs": { - "description": "RedirectURIs is the valid redirection URIs associated with a client", - "type": "array", - "items": { + "nodeSelector": { + "description": "nodeSelector defines the node selection constraints for the image pruner pod.", + "type": "object", + "additionalProperties": { "type": "string", "default": "" - }, - "x-kubernetes-patch-strategy": "merge" + } }, - "respondWithChallenges": { - "description": "RespondWithChallenges indicates whether the client wants authentication needed responses made in the form of challenges instead of redirects", + "resources": { + "description": "resources defines the resource requests and limits for the image pruner pod.", + "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" + }, + "schedule": { + "description": "schedule specifies when to execute the job using standard cronjob syntax: https://wikipedia.org/wiki/Cron. Defaults to `0 0 * * *`.", + "type": "string", + "default": "" + }, + "successfulJobsHistoryLimit": { + "description": "successfulJobsHistoryLimit specifies how many successful image pruner jobs to retain. Defaults to 3 if not set.", + "type": "integer", + "format": "int32" + }, + "suspend": { + "description": "suspend specifies whether or not to suspend subsequent executions of this cronjob. Defaults to false.", "type": "boolean" }, - "scopeRestrictions": { - "description": "ScopeRestrictions describes which scopes this client can request. Each requested scope is checked against each restriction. If any restriction matches, then the scope is allowed. If no restriction matches, then the scope is denied.", + "tolerations": { + "description": "tolerations defines the node tolerations for the image pruner pod.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.ScopeRestriction" + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" } - }, - "secret": { - "description": "Secret is the unique secret associated with a client", - "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthClient", - "Scope": "Clustered" + "Kind": "ImagePrunerSpec", + "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.OAuthClientAuthorization": { - "description": "OAuthClientAuthorization describes an authorization created by an OAuth client\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImagePrunerStatus": { + "description": "ImagePrunerStatus reports image pruner operational status.", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "clientName": { - "description": "ClientName references the client that created this authorization", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "scopes": { - "description": "Scopes is an array of the granted scopes.", + "conditions": { + "description": "conditions is a list of conditions and their status.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" } }, - "userName": { - "description": "UserName is the user name that authorized this client", - "type": "string" - }, - "userUID": { - "description": "UserUID is the unique UID associated with this authorization. UserUID and UserName must both match for this authorization to be valid.", - "type": "string" + "observedGeneration": { + "description": "observedGeneration is the last generation change that has been applied.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { - "Type": "object", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthClientAuthorization", - "Scope": "Clustered" + "Kind": "ImagePrunerStatus", + "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.OAuthClientAuthorizationList": { - "description": "OAuthClientAuthorizationList is a collection of OAuth client authorizations\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigProxy": { + "description": "ImageRegistryConfigProxy defines proxy configuration to be used by registry.", "type": "object", - "required": [ - "items" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "http": { + "description": "http defines the proxy to be used by the image registry when accessing HTTP endpoints.", "type": "string" }, - "items": { - "description": "Items is the list of OAuth client authorizations", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.OAuthClientAuthorization" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "https": { + "description": "https defines the proxy to be used by the image registry when accessing HTTPS endpoints.", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "noProxy": { + "description": "noProxy defines a comma-separated list of host names that shouldn't go through any proxy.", + "type": "string" } }, "x-fabric8-info": { - "Type": "list", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthClientAuthorizationList", + "Kind": "ImageRegistryConfigProxy", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.OAuthClientList": { - "description": "OAuthClientList is a collection of OAuth clients\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigRequests": { + "description": "ImageRegistryConfigRequests defines registry limits on requests read and write.", "type": "object", - "required": [ - "items" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "description": "Items is the list of OAuth clients", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.OAuthClient" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "read": { + "description": "read defines limits for image registry's reads.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigRequestsLimits" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "write": { + "description": "write defines limits for image registry's writes.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigRequestsLimits" } }, "x-fabric8-info": { - "Type": "list", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthClientList", + "Kind": "ImageRegistryConfigRequests", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.OAuthRedirectReference": { - "description": "OAuthRedirectReference is a reference to an OAuth redirect object.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigRequestsLimits": { + "description": "ImageRegistryConfigRequestsLimits holds configuration on the max, enqueued and waiting registry's API requests.", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "maxInQueue": { + "description": "maxInQueue sets the maximum queued api requests to the registry.", + "type": "integer", + "format": "int32" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "maxRunning": { + "description": "maxRunning sets the maximum in flight api requests to the registry.", + "type": "integer", + "format": "int32" }, - "reference": { - "description": "The reference to an redirect object in the current namespace.", - "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.RedirectReference" + "maxWaitInQueue": { + "description": "maxWaitInQueue sets the maximum time a request can wait in the queue before being rejected.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" } }, "x-fabric8-info": { - "Type": "object", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "OAuthRedirectReference", + "Kind": "ImageRegistryConfigRequestsLimits", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.RedirectReference": { - "description": "RedirectReference specifies the target in the current namespace that resolves into redirect URIs. Only the 'Route' kind is currently allowed.", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigRoute": { + "description": "ImageRegistryConfigRoute holds information on external route access to image registry.", "type": "object", "required": [ - "group", - "kind", "name" ], "properties": { - "group": { - "description": "The group of the target that is being referred to.", - "type": "string", - "default": "" - }, - "kind": { - "description": "The kind of the target that is being referred to. Currently, only 'Route' is allowed.", - "type": "string", - "default": "" + "hostname": { + "description": "hostname for the route.", + "type": "string" }, "name": { - "description": "The name of the target that is being referred to. e.g. name of the Route.", + "description": "name of the route to be created.", "type": "string", "default": "" + }, + "secretName": { + "description": "secretName points to secret containing the certificates to be used by the route.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "oauth.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "RedirectReference", + "Kind": "ImageRegistryConfigRoute", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.ScopeRestriction": { - "description": "ScopeRestriction describe one restriction on scopes. Exactly one option must be non-nil.", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorage": { + "description": "ImageRegistryConfigStorage describes how the storage should be configured for the image registry.", "type": "object", "properties": { - "clusterRole": { - "description": "ClusterRole describes a set of restrictions for cluster role scoping.", - "$ref": "#/definitions/io.openshift.oauth.v1.ClusterRoleScopeRestriction" + "azure": { + "description": "azure represents configuration that uses Azure Blob Storage.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageAzure" }, - "literals": { - "description": "ExactValues means the scope has to match a particular set of strings exactly", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "emptyDir": { + "description": "emptyDir represents ephemeral storage on the pod's host node. WARNING: this storage cannot be used with more than 1 replica and is not suitable for production use. When the pod is removed from a node for any reason, the data in the emptyDir is deleted forever.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageEmptyDir" + }, + "gcs": { + "description": "gcs represents configuration that uses Google Cloud Storage.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageGCS" + }, + "ibmcos": { + "description": "ibmcos represents configuration that uses IBM Cloud Object Storage.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageIBMCOS" + }, + "managementState": { + "description": "managementState indicates if the operator manages the underlying storage unit. If Managed the operator will remove the storage when this operator gets Removed.", + "type": "string" + }, + "oss": { + "description": "Oss represents configuration that uses Alibaba Cloud Object Storage Service.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageAlibabaOSS" + }, + "pvc": { + "description": "pvc represents configuration that uses a PersistentVolumeClaim.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStoragePVC" + }, + "s3": { + "description": "s3 represents configuration that uses Amazon Simple Storage Service.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageS3" + }, + "swift": { + "description": "swift represents configuration that uses OpenStack Object Storage.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageSwift" } }, "x-fabric8-info": { "Type": "nested", - "Group": "oauth.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "ScopeRestriction", + "Kind": "ImageRegistryConfigStorage", "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.UserOAuthAccessToken": { - "description": "UserOAuthAccessToken is a virtual resource to mirror OAuthAccessTokens to the user the access token was issued for", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageAlibabaOSS": { + "description": "ImageRegistryConfigStorageAlibabaOSS holds Alibaba Cloud OSS configuration. Configures the registry to use Alibaba Cloud Object Storage Service for backend storage. More about oss, you can look at the [official documentation](https://www.alibabacloud.com/help/product/31815.htm)", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "bucket": { + "description": "Bucket is the bucket name in which you want to store the registry's data. About Bucket naming, more details you can look at the [official documentation](https://www.alibabacloud.com/help/doc-detail/257087.htm) Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default will be autogenerated in the form of \u003cclusterid\u003e-image-registry-\u003cregion\u003e-\u003crandom string 27 chars\u003e", "type": "string" }, - "authorizeToken": { - "description": "AuthorizeToken contains the token that authorized this token", - "type": "string" + "encryption": { + "description": "Encryption specifies whether you would like your data encrypted on the server side. More details, you can look cat the [official documentation](https://www.alibabacloud.com/help/doc-detail/117914.htm)", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.EncryptionAlibaba" }, - "clientName": { - "description": "ClientName references the client that created this token.", + "endpointAccessibility": { + "description": "EndpointAccessibility specifies whether the registry use the OSS VPC internal endpoint Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default is `Internal`.", "type": "string" }, - "expiresIn": { - "description": "ExpiresIn is the seconds from CreationTime before this token expires.", - "type": "integer", - "format": "int64" - }, - "inactivityTimeoutSeconds": { - "description": "InactivityTimeoutSeconds is the value in seconds, from the CreationTimestamp, after which this token can no longer be used. The value is automatically incremented when the token is used.", - "type": "integer", - "format": "int32" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "region": { + "description": "Region is the Alibaba Cloud Region in which your bucket exists. For a list of regions, you can look at the [official documentation](https://www.alibabacloud.com/help/doc-detail/31837.html). Empty value means no opinion and the platform chooses the a default, which is subject to change over time. Currently the default will be based on the installed Alibaba Cloud Region.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", + "Version": "v1", + "Kind": "ImageRegistryConfigStorageAlibabaOSS", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageAzure": { + "description": "ImageRegistryConfigStorageAzure holds the information to configure the registry to use Azure Blob Storage for backend storage.", + "type": "object", + "properties": { + "accountName": { + "description": "accountName defines the account to be used by the registry.", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "cloudName": { + "description": "cloudName is the name of the Azure cloud environment to be used by the registry. If empty, the operator will set it based on the infrastructure object.", + "type": "string" }, - "redirectURI": { - "description": "RedirectURI is the redirection associated with the token.", + "container": { + "description": "container defines Azure's container to be used by registry.", "type": "string" }, - "refreshToken": { - "description": "RefreshToken is the value by which this token can be renewed. Can be blank.", + "networkAccess": { + "description": "networkAccess defines the network access properties for the storage account. Defaults to type: External.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.AzureNetworkAccess" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", + "Version": "v1", + "Kind": "ImageRegistryConfigStorageAzure", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageEmptyDir": { + "description": "ImageRegistryConfigStorageEmptyDir is an place holder to be used when when registry is leveraging ephemeral storage.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", + "Version": "v1", + "Kind": "ImageRegistryConfigStorageEmptyDir", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageGCS": { + "description": "ImageRegistryConfigStorageGCS holds GCS configuration.", + "type": "object", + "properties": { + "bucket": { + "description": "bucket is the bucket name in which you want to store the registry's data. Optional, will be generated if not provided.", "type": "string" }, - "scopes": { - "description": "Scopes is an array of the requested scopes.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "keyID": { + "description": "keyID is the KMS key ID to use for encryption. Optional, buckets are encrypted by default on GCP. This allows for the use of a custom encryption key.", + "type": "string" }, - "userName": { - "description": "UserName is the user name associated with this token", + "projectID": { + "description": "projectID is the Project ID of the GCP project that this bucket should be associated with.", "type": "string" }, - "userUID": { - "description": "UserUID is the unique UID associated with this token", + "region": { + "description": "region is the GCS location in which your bucket exists. Optional, will be set based on the installed GCS Region.", "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "UserOAuthAccessToken", - "Scope": "Clustered" + "Kind": "ImageRegistryConfigStorageGCS", + "Scope": "Namespaced" } }, - "io.openshift.oauth.v1.UserOAuthAccessTokenList": { - "description": "UserOAuthAccessTokenList is a collection of access tokens issued on behalf of the requesting user\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageIBMCOS": { + "description": "ImageRegistryConfigStorageIBMCOS holds the information to configure the registry to use IBM Cloud Object Storage for backend storage.", "type": "object", - "required": [ - "items" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "bucket": { + "description": "bucket is the bucket name in which you want to store the registry's data. Optional, will be generated if not provided.", "type": "string" }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.oauth.v1.UserOAuthAccessToken" - } + "location": { + "description": "location is the IBM Cloud location in which your bucket exists. Optional, will be set based on the installed IBM Cloud location.", + "type": "string" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "resourceGroupName": { + "description": "resourceGroupName is the name of the IBM Cloud resource group that this bucket and its service instance is associated with. Optional, will be set based on the installed IBM Cloud resource group.", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "resourceKeyCRN": { + "description": "resourceKeyCRN is the CRN of the IBM Cloud resource key that is created for the service instance. Commonly referred as a service credential and must contain HMAC type credentials. Optional, will be computed if not provided.", + "type": "string" + }, + "serviceInstanceCRN": { + "description": "serviceInstanceCRN is the CRN of the IBM Cloud Object Storage service instance that this bucket is associated with. Optional, will be computed if not provided.", + "type": "string" } }, "x-fabric8-info": { - "Type": "list", - "Group": "oauth.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "UserOAuthAccessTokenList", + "Kind": "ImageRegistryConfigStorageIBMCOS", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.APIServers": { + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStoragePVC": { + "description": "ImageRegistryConfigStoragePVC holds Persistent Volume Claims data to be used by the registry.", "type": "object", - "required": [ - "perGroupOptions" - ], "properties": { - "perGroupOptions": { - "description": "perGroupOptions is a list of enabled/disabled API servers in addition to the defaults", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.PerGroupOptions" - } + "claim": { + "description": "claim defines the Persisent Volume Claim's name to be used.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "APIServers", + "Kind": "ImageRegistryConfigStoragePVC", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageS3": { + "description": "ImageRegistryConfigStorageS3 holds the information to configure the registry to use the AWS S3 service for backend storage https://docs.docker.com/registry/storage-drivers/s3/", + "type": "object", + "properties": { + "bucket": { + "description": "bucket is the bucket name in which you want to store the registry's data. Optional, will be generated if not provided.", + "type": "string" + }, + "chunkSizeMiB": { + "description": "chunkSizeMiB defines the size of the multipart upload chunks of the S3 API. The S3 API requires multipart upload chunks to be at least 5MiB. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default value is 10 MiB. The value is an integer number of MiB. The minimum value is 5 and the maximum value is 5120 (5 GiB).", + "type": "integer", + "format": "int32" + }, + "cloudFront": { + "description": "cloudFront configures Amazon Cloudfront as the storage middleware in a registry.", + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageS3CloudFront" + }, + "encrypt": { + "description": "encrypt specifies whether the registry stores the image in encrypted format or not. Optional, defaults to false.", + "type": "boolean" + }, + "keyID": { + "description": "keyID is the KMS key ID to use for encryption. Optional, Encrypt must be true, or this parameter is ignored.", + "type": "string" + }, + "region": { + "description": "region is the AWS region in which your bucket exists. Optional, will be set based on the installed AWS Region.", + "type": "string" + }, + "regionEndpoint": { + "description": "regionEndpoint is the endpoint for S3 compatible storage services. It should be a valid URL with scheme, e.g. https://s3.example.com. Optional, defaults based on the Region that is provided.", + "type": "string" + }, + "trustedCA": { + "description": "trustedCA is a reference to a config map containing a CA bundle. The image registry and its operator use certificates from this bundle to verify S3 server certificates.\n\nThe namespace for the config map referenced by trustedCA is \"openshift-config\". The key for the bundle in the config map is \"ca-bundle.crt\".", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.S3TrustedCASource" + }, + "virtualHostedStyle": { + "description": "virtualHostedStyle enables using S3 virtual hosted style bucket paths with a custom RegionEndpoint Optional, defaults to false.", + "type": "boolean", + "default": false + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", + "Version": "v1", + "Kind": "ImageRegistryConfigStorageS3", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.BuildControllerConfig": { + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageS3CloudFront": { + "description": "ImageRegistryConfigStorageS3CloudFront holds the configuration to use Amazon Cloudfront as the storage middleware in a registry. https://docs.docker.com/registry/configuration/#cloudfront", "type": "object", "required": [ - "imageTemplateFormat", - "buildDefaults", - "buildOverrides", - "additionalTrustedCA" + "baseURL", + "privateKey", + "keypairID" ], "properties": { - "additionalTrustedCA": { - "description": "additionalTrustedCA is a path to a pem bundle file containing additional CAs that should be trusted for image pushes and pulls during builds.", + "baseURL": { + "description": "baseURL contains the SCHEME://HOST[/PATH] at which Cloudfront is served.", "type": "string", "default": "" }, - "buildDefaults": { - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.BuildDefaultsConfig" + "duration": { + "description": "duration is the duration of the Cloudfront session.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "buildOverrides": { - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.BuildOverridesConfig" + "keypairID": { + "description": "keypairID is key pair ID provided by AWS.", + "type": "string", + "default": "" }, - "imageTemplateFormat": { + "privateKey": { + "description": "privateKey points to secret containing the private key, provided by AWS.", "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ImageConfig" + "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "BuildControllerConfig", + "Kind": "ImageRegistryConfigStorageS3CloudFront", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.BuildDefaultsConfig": { - "description": "BuildDefaultsConfig controls the default information for Builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorageSwift": { + "description": "ImageRegistryConfigStorageSwift holds the information to configure the registry to use the OpenStack Swift service for backend storage https://docs.docker.com/registry/storage-drivers/swift/", "type": "object", "properties": { - "annotations": { - "description": "annotations are annotations that will be added to the build pod", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "authURL": { + "description": "authURL defines the URL for obtaining an authentication token.", "type": "string" }, - "env": { - "description": "env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.EnvVar" - } - }, - "gitHTTPProxy": { - "description": "gitHTTPProxy is the location of the HTTPProxy for Git source", + "authVersion": { + "description": "authVersion specifies the OpenStack Auth's version.", "type": "string" }, - "gitHTTPSProxy": { - "description": "gitHTTPSProxy is the location of the HTTPSProxy for Git source", + "container": { + "description": "container defines the name of Swift container where to store the registry's data.", "type": "string" }, - "gitNoProxy": { - "description": "gitNoProxy is the list of domains for which the proxy should not be used", + "domain": { + "description": "domain specifies Openstack's domain name for Identity v3 API.", "type": "string" }, - "imageLabels": { - "description": "imageLabels is a list of labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "domainID": { + "description": "domainID specifies Openstack's domain id for Identity v3 API.", "type": "string" }, - "nodeSelector": { - "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "regionName": { + "description": "regionName defines Openstack's region in which container exists.", + "type": "string" }, - "resources": { - "description": "resources defines resource requirements to execute the build.", - "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" + "tenant": { + "description": "tenant defines Openstack tenant name to be used by registry.", + "type": "string" }, - "sourceStrategyDefaults": { - "description": "sourceStrategyDefaults are default values that apply to builds using the source strategy.", - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.SourceStrategyDefaultsConfig" + "tenantID": { + "description": "tenant defines Openstack tenant id to be used by registry.", + "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "BuildDefaultsConfig", + "Kind": "ImageRegistryConfigStorageSwift", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.BuildOverridesConfig": { - "description": "BuildOverridesConfig controls override settings for builds\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.imageregistry.v1.ImageRegistrySpec": { + "description": "ImageRegistrySpec defines the specs for the running registry.", "type": "object", + "required": [ + "managementState", + "replicas" + ], "properties": { - "annotations": { - "description": "annotations are annotations that will be added to the build pod", + "affinity": { + "description": "affinity is a group of node affinity scheduling rules for the image registry pod(s).", + "$ref": "#/definitions/io.k8s.api.core.v1.Affinity" + }, + "defaultRoute": { + "description": "defaultRoute indicates whether an external facing route for the registry should be created using the default generated hostname.", + "type": "boolean" + }, + "disableRedirect": { + "description": "disableRedirect controls whether to route all data through the Registry, rather than redirecting to the backend.", + "type": "boolean" + }, + "httpSecret": { + "description": "httpSecret is the value needed by the registry to secure uploads, generated by default.", + "type": "string" + }, + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "logging": { + "description": "logging is deprecated, use logLevel instead.", + "type": "integer", + "format": "int64" + }, + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", + "type": "string", + "default": "" + }, + "nodeSelector": { + "description": "nodeSelector defines the node selection constraints for the registry pod.", "type": "object", "additionalProperties": { "type": "string", "default": "" } }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, - "forcePull": { - "description": "forcePull overrides, if set, the equivalent value in the builds, i.e. false disables force pull for all builds, true enables force pull for all builds, independently of what each build specifies itself", + "proxy": { + "description": "proxy defines the proxy to be used when calling master api, upstream registries, etc.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigProxy" + }, + "readOnly": { + "description": "readOnly indicates whether the registry instance should reject attempts to push new images or delete existing ones.", "type": "boolean" }, - "imageLabels": { - "description": "imageLabels is a list of labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.", + "replicas": { + "description": "replicas determines the number of registry instances to run.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "requests": { + "description": "requests controls how many parallel requests a given registry instance will handle before queuing additional requests.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigRequests", + "x-kubernetes-map-type": "atomic" + }, + "resources": { + "description": "resources defines the resource requests+limits for the registry pod.", + "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements", + "x-kubernetes-map-type": "atomic" + }, + "rolloutStrategy": { + "description": "rolloutStrategy defines rollout strategy for the image registry deployment.", + "type": "string" + }, + "routes": { + "description": "routes defines additional external facing routes which should be created for the registry.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.build.v1.ImageLabel" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigRoute" + }, + "x-kubernetes-list-type": "atomic" }, - "nodeSelector": { - "description": "nodeSelector is a selector which must be true for the build pod to fit on a node", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "storage": { + "description": "storage details for configuring registry storage, e.g. S3 bucket coordinates.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorage" }, "tolerations": { - "description": "tolerations is a list of Tolerations that will override any existing tolerations set on a build pod.", + "description": "tolerations defines the tolerations for the registry pod.", "type": "array", "items": { "default": {}, "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" - } + }, + "x-kubernetes-list-type": "atomic" + }, + "topologySpreadConstraints": { + "description": "topologySpreadConstraints specify how to spread matching pods among the given topology.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.TopologySpreadConstraint" + }, + "x-kubernetes-list-type": "atomic" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { - "Type": "object", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "nested", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "BuildOverridesConfig", + "Kind": "ImageRegistrySpec", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ClusterNetworkEntry": { - "description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.", + "io.openshift.operator.imageregistry.v1.ImageRegistryStatus": { + "description": "ImageRegistryStatus reports image registry operational status.", "type": "object", "required": [ - "cidr", - "hostSubnetLength" + "readyReplicas", + "storageManaged", + "storage" ], "properties": { - "cidr": { - "description": "CIDR defines the total range of a cluster networks address space.", - "type": "string", - "default": "" + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "hostSubnetLength": { - "description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pod.", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", "type": "integer", - "format": "int64", + "format": "int32" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", "default": 0 + }, + "storage": { + "description": "storage indicates the current applied storage configuration of the registry.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.imageregistry.v1.ImageRegistryConfigStorage" + }, + "storageManaged": { + "description": "storageManaged is deprecated, please refer to Storage.managementState", + "type": "boolean", + "default": false + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "ClusterNetworkEntry", + "Kind": "ImageRegistryStatus", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.DeployerControllerConfig": { + "io.openshift.operator.imageregistry.v1.KMSEncryptionAlibaba": { "type": "object", "required": [ - "imageTemplateFormat" + "keyID" ], "properties": { - "imageTemplateFormat": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ImageConfig" + "keyID": { + "description": "KeyID holds the KMS encryption key ID", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "DeployerControllerConfig", + "Kind": "KMSEncryptionAlibaba", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.DockerPullSecretControllerConfig": { + "io.openshift.operator.imageregistry.v1.S3TrustedCASource": { + "description": "S3TrustedCASource references a config map with a CA certificate bundle in the \"openshift-config\" namespace. The key for the bundle in the config map is \"ca-bundle.crt\".", "type": "object", - "required": [ - "registryURLs", - "internalRegistryHostname" - ], "properties": { - "internalRegistryHostname": { - "description": "internalRegistryHostname is the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. Docker pull secrets will be generated for this registry.", + "name": { + "description": "name is the metadata.name of the referenced config map. This field must adhere to standard config map naming restrictions. The name must consist solely of alphanumeric characters, hyphens (-) and periods (.). It has a maximum length of 253 characters. If this field is not specified or is empty string, the default trust bundle will be used.", "type": "string", "default": "" - }, - "registryURLs": { - "description": "registryURLs is a list of urls that the docker pull secrets should be valid for.", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "imageregistry.operator.openshift.io", "Version": "v1", - "Kind": "DockerPullSecretControllerConfig", + "Kind": "S3TrustedCASource", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.FrontProxyConfig": { + "io.openshift.operator.ingress.v1.DNSRecord": { + "description": "DNSRecord is a DNS record managed in the zones defined by dns.config.openshift.io/cluster .spec.publicZone and .spec.privateZone.\n\nCluster admin manipulation of this resource is not supported. This resource is only for internal communication of OpenShift operators.\n\nIf DNSManagementPolicy is \"Unmanaged\", the operator will not be responsible for managing the DNS records on the cloud provider.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "clientCA", - "allowedNames", - "usernameHeaders", - "groupHeaders", - "extraHeaderPrefixes" + "spec", + "status" ], "properties": { - "allowedNames": { - "description": "allowedNames is an optional list of common names to require a match from.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "clientCA": { - "description": "clientCA is a path to the CA bundle to use to verify the common name of the front proxy's client cert", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "extraHeaderPrefixes": { - "description": "extraHeaderPrefixes is the set of header prefixes to check for user extra", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "groupHeaders": { - "description": "groupHeaders is the set of headers to check for groups", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "spec": { + "description": "spec is the specification of the desired behavior of the dnsRecord.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.ingress.v1.DNSRecordSpec" }, - "usernameHeaders": { - "description": "usernameHeaders is the set of headers to check for the username", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "status": { + "description": "status is the most recently observed status of the dnsRecord.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.ingress.v1.DNSRecordStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "object", + "Group": "ingress.operator.openshift.io", "Version": "v1", - "Kind": "FrontProxyConfig", + "Kind": "DNSRecord", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ImageConfig": { - "description": "ImageConfig holds the necessary configuration options for building image names for system components", + "io.openshift.operator.ingress.v1.DNSRecordList": { + "description": "DNSRecordList contains a list of dnsrecords.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "format", - "latest" + "items" ], "properties": { - "format": { - "description": "Format is the format of the name to be built for the system component", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "latest": { - "description": "Latest determines if the latest tag will be pulled from the registry", - "type": "boolean", - "default": false + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.ingress.v1.DNSRecord" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "list", + "Group": "ingress.operator.openshift.io", "Version": "v1", - "Kind": "ImageConfig", + "Kind": "DNSRecordList", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ImageImportControllerConfig": { + "io.openshift.operator.ingress.v1.DNSRecordSpec": { + "description": "DNSRecordSpec contains the details of a DNS record.", "type": "object", "required": [ - "maxScheduledImageImportsPerMinute", - "disableScheduledImport", - "scheduledImageImportMinimumIntervalSeconds" + "dnsName", + "targets", + "recordType", + "recordTTL" ], "properties": { - "disableScheduledImport": { - "description": "disableScheduledImport allows scheduled background import of images to be disabled.", - "type": "boolean", - "default": false + "dnsManagementPolicy": { + "description": "dnsManagementPolicy denotes the current policy applied on the DNS record. Records that have policy set as \"Unmanaged\" are ignored by the ingress operator. This means that the DNS record on the cloud provider is not managed by the operator, and the \"Published\" status condition will be updated to \"Unknown\" status, since it is externally managed. Any existing record on the cloud provider can be deleted at the discretion of the cluster admin.\n\nThis field defaults to Managed. Valid values are \"Managed\" and \"Unmanaged\".", + "type": "string", + "default": "Managed" }, - "maxScheduledImageImportsPerMinute": { - "description": "maxScheduledImageImportsPerMinute is the maximum number of image streams that will be imported in the background per minute. The default value is 60. Set to -1 for unlimited.", - "type": "integer", - "format": "int32", - "default": 0 + "dnsName": { + "description": "dnsName is the hostname of the DNS record", + "type": "string", + "default": "" }, - "scheduledImageImportMinimumIntervalSeconds": { - "description": "scheduledImageImportMinimumIntervalSeconds is the minimum number of seconds that can elapse between when image streams scheduled for background import are checked against the upstream repository. The default value is 15 minutes.", + "recordTTL": { + "description": "recordTTL is the record TTL in seconds. If zero, the default is 30. RecordTTL will not be used in AWS regions Alias targets, but will be used in CNAME targets, per AWS API contract.", "type": "integer", - "format": "int32", + "format": "int64", "default": 0 - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", - "Version": "v1", - "Kind": "ImageImportControllerConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.openshiftcontrolplane.v1.ImagePolicyConfig": { - "type": "object", - "required": [ - "maxImagesBulkImportedPerRepository", - "allowedRegistriesForImport", - "internalRegistryHostname", - "externalRegistryHostnames", - "additionalTrustedCA" - ], - "properties": { - "additionalTrustedCA": { - "description": "additionalTrustedCA is a path to a pem bundle file containing additional CAs that should be trusted during imagestream import.", + }, + "recordType": { + "description": "recordType is the DNS record type. For example, \"A\" or \"CNAME\".", "type": "string", "default": "" }, - "allowedRegistriesForImport": { - "description": "allowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.RegistryLocation" - } - }, - "externalRegistryHostnames": { - "description": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.", + "targets": { + "description": "targets are record targets.", "type": "array", "items": { "type": "string", "default": "" } - }, - "internalRegistryHostname": { - "description": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format.", - "type": "string", - "default": "" - }, - "maxImagesBulkImportedPerRepository": { - "description": "maxImagesBulkImportedPerRepository controls the number of images that are imported when a user does a bulk import of a container repository. This number is set low to prevent users from importing large numbers of images accidentally. Set -1 for no limit.", - "type": "integer", - "format": "int32", - "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "ingress.operator.openshift.io", "Version": "v1", - "Kind": "ImagePolicyConfig", + "Kind": "DNSRecordSpec", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.IngressControllerConfig": { + "io.openshift.operator.ingress.v1.DNSRecordStatus": { + "description": "DNSRecordStatus is the most recently observed status of each record.", "type": "object", - "required": [ - "ingressIPNetworkCIDR" - ], "properties": { - "ingressIPNetworkCIDR": { - "description": "ingressIPNetworkCIDR controls the range to assign ingress ips from for services of type LoadBalancer on bare metal. If empty, ingress ips will not be assigned. It may contain a single CIDR that will be allocated from. For security reasons, you should ensure that this range does not overlap with the CIDRs reserved for external ips, nodes, pods, or services.", - "type": "string", - "default": "" + "observedGeneration": { + "description": "observedGeneration is the most recently observed generation of the DNSRecord. When the DNSRecord is updated, the controller updates the corresponding record in each managed zone. If an update for a particular zone fails, that failure is recorded in the status condition for the zone so that the controller can determine that it needs to retry the update for that specific zone.", + "type": "integer", + "format": "int64" + }, + "zones": { + "description": "zones are the status of the record in each zone.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.ingress.v1.DNSZoneStatus" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "ingress.operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerConfig", + "Kind": "DNSRecordStatus", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.JenkinsPipelineConfig": { - "description": "JenkinsPipelineConfig holds configuration for the Jenkins pipeline strategy", + "io.openshift.operator.ingress.v1.DNSZoneCondition": { + "description": "DNSZoneCondition is just the standard condition fields.", "type": "object", "required": [ - "autoProvisionEnabled", - "templateNamespace", - "templateName", - "serviceName", - "parameters" + "type", + "status" ], "properties": { - "autoProvisionEnabled": { - "description": "autoProvisionEnabled determines whether a Jenkins server will be spawned from the provided template when the first build config in the project with type JenkinsPipeline is created. When not specified this option defaults to true.", - "type": "boolean" + "lastTransitionTime": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "parameters": { - "description": "parameters specifies a set of optional parameters to the Jenkins template.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "message": { + "type": "string" }, - "serviceName": { - "description": "serviceName is the name of the Jenkins service OpenShift uses to detect whether a Jenkins pipeline handler has already been installed in a project. This value *must* match a service name in the provided template.", - "type": "string", - "default": "" + "reason": { + "type": "string" }, - "templateName": { - "description": "templateName is the name of the default Jenkins template", + "status": { "type": "string", "default": "" }, - "templateNamespace": { - "description": "templateNamespace contains the namespace name where the Jenkins template is stored", + "type": { "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "ingress.operator.openshift.io", "Version": "v1", - "Kind": "JenkinsPipelineConfig", + "Kind": "DNSZoneCondition", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.NetworkControllerConfig": { - "description": "MasterNetworkConfig to be passed to the compiled in network plugin", + "io.openshift.operator.ingress.v1.DNSZoneStatus": { + "description": "DNSZoneStatus is the status of a record within a specific zone.", "type": "object", "required": [ - "networkPluginName", - "clusterNetworks", - "serviceNetworkCIDR", - "vxlanPort" + "dnsZone" ], "properties": { - "clusterNetworks": { - "description": "clusterNetworks contains a list of cluster networks that defines the global overlay networks L3 space.", + "conditions": { + "description": "conditions are any conditions associated with the record in the zone.\n\nIf publishing the record succeeds, the \"Published\" condition will be set with status \"True\" and upon failure it will be set to \"False\" along with the reason and message describing the cause of the failure.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ClusterNetworkEntry" + "$ref": "#/definitions/io.openshift.operator.ingress.v1.DNSZoneCondition" } }, - "networkPluginName": { - "type": "string", - "default": "" - }, - "serviceNetworkCIDR": { - "type": "string", - "default": "" - }, - "vxlanPort": { - "type": "integer", - "format": "int64", - "default": 0 + "dnsZone": { + "description": "dnsZone is the zone where the record is published.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.DNSZone" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "ingress.operator.openshift.io", "Version": "v1", - "Kind": "NetworkControllerConfig", + "Kind": "DNSZoneStatus", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.OpenShiftAPIServerConfig": { - "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.network.v1.EgressRouter": { + "description": "EgressRouter is a feature allowing the user to define an egress router that acts as a bridge between pods and external systems. The egress router runs a service that redirects egress traffic originating from a pod or a group of pods to a remote external system or multiple destinations as per configuration.\n\nIt is consumed by the cluster-network-operator. More specifically, given an EgressRouter CR with \u003cname\u003e, the CNO will create and manage: - A service called \u003cname\u003e - An egress pod called \u003cname\u003e - A NAD called \u003cname\u003e\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).\n\nEgressRouter is a single egressrouter pod configuration object.", "type": "object", "required": [ - "servingInfo", - "corsAllowedOrigins", - "auditConfig", - "storageConfig", - "admission", - "kubeClientConfig", - "aggregatorConfig", - "imagePolicyConfig", - "projectConfig", - "routingConfig", - "serviceAccountOAuthGrantMethod", - "jenkinsPipelineConfig", - "cloudProviderFile", - "apiServerArguments", - "apiServers" - ], - "properties": { - "admission": { - "description": "admissionConfig holds information about how to configure admission.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" - }, - "aggregatorConfig": { - "description": "aggregatorConfig contains information about how to verify the aggregator front proxy", - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.FrontProxyConfig" - }, - "apiServerArguments": { - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "apiServers": { - "description": "apiServers holds information about enabled/disabled API servers", - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.APIServers" - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "auditConfig": { - "description": "auditConfig describes how to configure audit information", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" - }, - "cloudProviderFile": { - "description": "cloudProviderFile points to the cloud config file", - "type": "string", - "default": "" - }, - "corsAllowedOrigins": { - "description": "corsAllowedOrigins", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "imagePolicyConfig": { - "description": "imagePolicyConfig feeds the image policy admission plugin", - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ImagePolicyConfig" - }, - "jenkinsPipelineConfig": { - "description": "jenkinsPipelineConfig holds information about the default Jenkins template used for JenkinsPipeline build strategy.", - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.JenkinsPipelineConfig" + "spec" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "kubeClientConfig": { + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "projectConfig": { - "description": "projectConfig feeds an admission plugin", + "spec": { + "description": "Specification of the desired egress router.", "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ProjectConfig" + "$ref": "#/definitions/io.openshift.operator.network.v1.EgressRouterSpec" }, - "routingConfig": { - "description": "routingConfig holds information about routing and route generation", + "status": { + "description": "Observed status of EgressRouter.", "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.RoutingConfig" + "$ref": "#/definitions/io.openshift.operator.network.v1.EgressRouterStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "network.operator.openshift.io", + "Version": "v1", + "Kind": "EgressRouter", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.network.v1.EgressRouterAddress": { + "description": "EgressRouterAddress contains a pair of IP CIDR and gateway to be configured on the router's interface", + "type": "object", + "required": [ + "ip" + ], + "properties": { + "gateway": { + "description": "IP address of the next-hop gateway, if it cannot be automatically determined. Can be IPv4 or IPv6.", + "type": "string" }, - "serviceAccountOAuthGrantMethod": { - "description": "serviceAccountOAuthGrantMethod is used for determining client authorization for service account oauth client. It must be either: deny, prompt, or \"\"", + "ip": { + "description": "IP is the address to configure on the router's interface. Can be IPv4 or IPv6.", "type": "string", "default": "" - }, - "servingInfo": { - "description": "servingInfo describes how to start serving", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" - }, - "storageConfig": { - "description": "storageConfig contains information about how to use", + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "network.operator.openshift.io", + "Version": "v1", + "Kind": "EgressRouterAddress", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.network.v1.EgressRouterInterface": { + "description": "EgressRouterInterface contains the configuration of interface to create/use.", + "type": "object", + "required": [ + "macvlan" + ], + "properties": { + "macvlan": { + "description": "Arguments specific to the interfaceType macvlan", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" + "$ref": "#/definitions/io.openshift.operator.network.v1.MacvlanConfig" } }, "x-fabric8-info": { - "Type": "object", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "nested", + "Group": "network.operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftAPIServerConfig", + "Kind": "EgressRouterInterface", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.OpenShiftControllerManagerConfig": { - "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.network.v1.EgressRouterList": { + "description": "EgressRouterList is the list of egress router pods requested.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "kubeClientConfig", - "servingInfo", - "leaderElection", - "controllers", - "resourceQuota", - "serviceServingCert", - "deployer", - "build", - "serviceAccount", - "dockerPullSecret", - "network", - "ingress", - "imageImport", - "securityAllocator", - "featureGates" + "items" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "build": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.BuildControllerConfig" - }, - "controllers": { - "description": "controllers is a list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller \"+ named 'foo', '-foo' disables the controller named 'foo'. Defaults to \"*\".", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "deployer": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.DeployerControllerConfig" - }, - "dockerPullSecret": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.DockerPullSecretControllerConfig" - }, - "featureGates": { - "description": "featureGates are the set of extra OpenShift feature gates for openshift-controller-manager. These feature gates can be used to enable features that are tech preview or otherwise not available on OpenShift by default.", + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.network.v1.EgressRouter" } }, - "imageImport": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ImageImportControllerConfig" - }, - "ingress": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.IngressControllerConfig" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "kubeClientConfig": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" - }, - "leaderElection": { - "description": "leaderElection defines the configuration for electing a controller instance to make changes to the cluster. If unspecified, the ControllerTTL value is checked to determine whether the legacy direct etcd election code will be used.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.LeaderElection" - }, - "network": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.NetworkControllerConfig" - }, - "resourceQuota": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ResourceQuotaControllerConfig" - }, - "securityAllocator": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.SecurityAllocator" - }, - "serviceAccount": { - "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ServiceAccountControllerConfig" - }, - "serviceServingCert": { + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.openshiftcontrolplane.v1.ServiceServingCert" - }, - "servingInfo": { - "description": "servingInfo describes how to start serving", - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "list", + "Group": "network.operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftControllerManagerConfig", + "Kind": "EgressRouterList", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.PerGroupOptions": { + "io.openshift.operator.network.v1.EgressRouterSpec": { + "description": "EgressRouterSpec contains the configuration for an egress router. Mode, networkInterface and addresses fields must be specified along with exactly one \"Config\" that matches the mode. Each config consists of parameters specific to that mode.", "type": "object", "required": [ - "name", - "enabledVersions", - "disabledVersions" + "mode", + "networkInterface", + "addresses" ], "properties": { - "disabledVersions": { - "description": "disabledVersions is a list of versions that must be disabled in addition to the defaults. Must not collide with the list of enabled versions", + "addresses": { + "description": "List of IP addresses to configure on the pod's secondary interface.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.network.v1.EgressRouterAddress" } }, - "enabledVersions": { - "description": "enabledVersions is a list of versions that must be enabled in addition to the defaults. Must not collide with the list of disabled versions", + "mode": { + "description": "Mode depicts the mode that is used for the egress router. The default mode is \"Redirect\" and is the only supported mode currently.", + "type": "string", + "default": "" + }, + "networkInterface": { + "description": "Specification of interface to create/use. The default is macvlan. Currently only macvlan is supported.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.network.v1.EgressRouterInterface" + }, + "redirect": { + "description": "Redirect represents the configuration parameters specific to redirect mode.", + "$ref": "#/definitions/io.openshift.operator.network.v1.RedirectConfig" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "network.operator.openshift.io", + "Version": "v1", + "Kind": "EgressRouterSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.network.v1.EgressRouterStatus": { + "description": "EgressRouterStatus contains the observed status of EgressRouter. Read-only.", + "type": "object", + "properties": { + "conditions": { + "description": "Observed status of the egress router", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.network.v1.EgressRouterStatusCondition" } - }, - "name": { - "description": "name is an API server name (see OpenShiftAPIserverName typed constants for a complete list of available API servers).", - "type": "string", - "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "network.operator.openshift.io", "Version": "v1", - "Kind": "PerGroupOptions", + "Kind": "EgressRouterStatus", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ProjectConfig": { + "io.openshift.operator.network.v1.EgressRouterStatusCondition": { + "description": "EgressRouterStatusCondition represents the state of the egress router's managed and monitored components.", "type": "object", "required": [ - "defaultNodeSelector", - "projectRequestMessage", - "projectRequestTemplate" + "type", + "status", + "lastTransitionTime" ], "properties": { - "defaultNodeSelector": { - "description": "defaultNodeSelector holds default project node label selector", - "type": "string", - "default": "" + "lastTransitionTime": { + "description": "LastTransitionTime is the time of the last update to the current status property.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "projectRequestMessage": { - "description": "projectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint", + "message": { + "description": "Message provides additional information about the current condition. This is only to be consumed by humans. It may contain Line Feed characters (U+000A), which should be rendered as new lines.", + "type": "string" + }, + "reason": { + "description": "Reason is the CamelCase reason for the condition's current status.", + "type": "string" + }, + "status": { + "description": "Status of the condition, one of True, False, Unknown.", "type": "string", "default": "" }, - "projectRequestTemplate": { - "description": "projectRequestTemplate is the template to use for creating projects in response to projectrequest. It is in the format namespace/template and it is optional. If it is not specified, a default template is used.", + "type": { + "description": "Type specifies the aspect reported by this condition; one of Available, Progressing, Degraded", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "network.operator.openshift.io", "Version": "v1", - "Kind": "ProjectConfig", + "Kind": "EgressRouterStatusCondition", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.RegistryLocation": { - "description": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.", + "io.openshift.operator.network.v1.L4RedirectRule": { + "description": "L4RedirectRule defines a DNAT redirection from a given port to a destination IP and port.", "type": "object", "required": [ - "domainName" + "destinationIP", + "port", + "protocol" ], "properties": { - "domainName": { - "description": "DomainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.", + "destinationIP": { + "description": "IP specifies the remote destination's IP address. Can be IPv4 or IPv6.", "type": "string", "default": "" }, - "insecure": { - "description": "Insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.", - "type": "boolean" + "port": { + "description": "Port is the port number to which clients should send traffic to be redirected.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "protocol": { + "description": "Protocol can be TCP, SCTP or UDP.", + "type": "string", + "default": "" + }, + "targetPort": { + "description": "TargetPort allows specifying the port number on the remote destination to which the traffic gets redirected to. If unspecified, the value from \"Port\" is used.", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "network.operator.openshift.io", "Version": "v1", - "Kind": "RegistryLocation", + "Kind": "L4RedirectRule", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ResourceQuotaControllerConfig": { + "io.openshift.operator.network.v1.MacvlanConfig": { + "description": "MacvlanConfig consists of arguments specific to the macvlan EgressRouterInterfaceType", "type": "object", "required": [ - "concurrentSyncs", - "syncPeriod", - "minResyncPeriod" + "mode" ], "properties": { - "concurrentSyncs": { - "type": "integer", - "format": "int32", - "default": 0 + "master": { + "description": "Name of the master interface. Need not be specified if it can be inferred from the IP address.", + "type": "string" }, - "minResyncPeriod": { - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "mode": { + "description": "Mode depicts the mode that is used for the macvlan interface; one of Bridge|Private|VEPA|Passthru. The default mode is \"Bridge\".", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "network.operator.openshift.io", + "Version": "v1", + "Kind": "MacvlanConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.network.v1.RedirectConfig": { + "description": "RedirectConfig represents the configuration parameters specific to redirect mode.", + "type": "object", + "properties": { + "fallbackIP": { + "description": "FallbackIP specifies the remote destination's IP address. Can be IPv4 or IPv6. If no redirect rules are specified, all traffic from the router are redirected to this IP. If redirect rules are specified, then any connections on any other port (undefined in the rules) on the router will be redirected to this IP. If redirect rules are specified and no fallback IP is provided, connections on other ports will simply be rejected.", + "type": "string" }, - "syncPeriod": { - "default": 0, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "redirectRules": { + "description": "List of L4RedirectRules that define the DNAT redirection from the pod to the destination in redirect mode.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.network.v1.L4RedirectRule" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "network.operator.openshift.io", "Version": "v1", - "Kind": "ResourceQuotaControllerConfig", + "Kind": "RedirectConfig", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.RoutingConfig": { - "description": "RoutingConfig holds the necessary configuration options for routing to subdomains", + "io.openshift.operator.samples.v1.Config": { + "description": "Config contains the configuration and detailed condition status for the Samples Operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "subdomain" + "metadata", + "spec" ], "properties": { - "subdomain": { - "description": "subdomain is the suffix appended to $service.$namespace. to form the default route hostname DEPRECATED: This field is being replaced by routers setting their own defaults. This is the \"default\" route.", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.samples.v1.ConfigSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.samples.v1.ConfigStatus" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "object", + "Group": "samples.operator.openshift.io", "Version": "v1", - "Kind": "RoutingConfig", - "Scope": "Namespaced" + "Kind": "Config", + "Scope": "Clustered" } }, - "io.openshift.openshiftcontrolplane.v1.SecurityAllocator": { - "description": "SecurityAllocator controls the automatic allocation of UIDs and MCS labels to a project. If nil, allocation is disabled.", + "io.openshift.operator.samples.v1.ConfigCondition": { + "description": "ConfigCondition captures various conditions of the Config as entries are processed.", "type": "object", "required": [ - "uidAllocatorRange", - "mcsAllocatorRange", - "mcsLabelsPerProject" + "type", + "status" ], "properties": { - "mcsAllocatorRange": { - "description": "MCSAllocatorRange defines the range of MCS categories that will be assigned to namespaces. The format is \"\u003cprefix\u003e/\u003cnumberOfLabels\u003e[,\u003cmaxCategory\u003e]\". The default is \"s0/2\" and will allocate from c0 -\u003e c1023, which means a total of 535k labels are available (1024 choose 2 ~ 535k). If this value is changed after startup, new projects may receive labels that are already allocated to other projects. Prefix may be any valid SELinux set of terms (including user, role, and type), although leaving them as the default will allow the server to set them automatically.\n\nExamples: * s0:/2 - Allocate labels from s0:c0,c0 to s0:c511,c511 * s0:/2,512 - Allocate labels from s0:c0,c0,c0 to s0:c511,c511,511", + "lastTransitionTime": { + "description": "lastTransitionTime is the last time the condition transitioned from one status to another.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "lastUpdateTime": { + "description": "lastUpdateTime is the last time this condition was updated.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "message": { + "description": "message is a human readable message indicating details about the transition.", + "type": "string" + }, + "reason": { + "description": "reason is what caused the condition's last transition.", + "type": "string" + }, + "status": { + "description": "status of the condition, one of True, False, Unknown.", "type": "string", "default": "" }, - "mcsLabelsPerProject": { - "description": "MCSLabelsPerProject defines the number of labels that should be reserved per project. The default is 5 to match the default UID and MCS ranges (100k namespaces, 535k/5 labels).", - "type": "integer", - "format": "int32", - "default": 0 - }, - "uidAllocatorRange": { - "description": "UIDAllocatorRange defines the total set of Unix user IDs (UIDs) that will be allocated to projects automatically, and the size of the block each namespace gets. For example, 1000-1999/10 will allocate ten UIDs per namespace, and will be able to allocate up to 100 blocks before running out of space. The default is to allocate from 1 billion to 2 billion in 10k blocks (which is the expected size of the ranges container images will use once user namespaces are started).", + "type": { + "description": "type of condition.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "samples.operator.openshift.io", "Version": "v1", - "Kind": "SecurityAllocator", + "Kind": "ConfigCondition", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ServiceAccountControllerConfig": { + "io.openshift.operator.samples.v1.ConfigList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "managedNames" + "metadata", + "items" ], "properties": { - "managedNames": { - "description": "managedNames is a list of service account names that will be auto-created in every namespace. If no names are specified, the ServiceAccountsController will not be started.", + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.samples.v1.Config" } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Type": "list", + "Group": "samples.operator.openshift.io", "Version": "v1", - "Kind": "ServiceAccountControllerConfig", + "Kind": "ConfigList", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.ServiceServingCert": { - "description": "ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for pods fulfilling a service to serve with.", + "io.openshift.operator.samples.v1.ConfigSpec": { + "description": "ConfigSpec contains the desired configuration and state for the Samples Operator, controlling various behavior around the imagestreams and templates it creates/updates in the openshift namespace.", "type": "object", - "required": [ - "signer" - ], "properties": { - "signer": { - "description": "Signer holds the signing information used to automatically sign serving certificates. If this value is nil, then certs are not signed automatically.", - "$ref": "#/definitions/io.openshift.config.v1.CertInfo" + "architectures": { + "description": "architectures determine which hardware architecture(s) to install, where x86_64, ppc64le, and s390x are the only supported choices currently.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "managementState": { + "description": "managementState is top level on/off type of switch for all operators. When \"Managed\", this operator processes config and manipulates the samples accordingly. When \"Unmanaged\", this operator ignores any updates to the resources it watches. When \"Removed\", it reacts that same wasy as it does if the Config object is deleted, meaning any ImageStreams or Templates it manages (i.e. it honors the skipped lists) and the registry secret are deleted, along with the ConfigMap in the operator's namespace that represents the last config used to manipulate the samples,", + "type": "string" + }, + "samplesRegistry": { + "description": "samplesRegistry allows for the specification of which registry is accessed by the ImageStreams for their image content. Defaults on the content in https://github.com/openshift/library that are pulled into this github repository, but based on our pulling only ocp content it typically defaults to registry.redhat.io.", + "type": "string" + }, + "skippedHelmCharts": { + "description": "skippedHelmCharts specifies names of helm charts that should NOT be managed. Admins can use this to allow them to delete content they don’t want. They will still have to MANUALLY DELETE the content but the operator will not recreate(or update) anything listed here. Few examples of the name of helmcharts which can be skipped are 'redhat-redhat-perl-imagestreams','redhat-redhat-nodejs-imagestreams','redhat-nginx-imagestreams', 'redhat-redhat-ruby-imagestreams','redhat-redhat-python-imagestreams','redhat-redhat-php-imagestreams', 'redhat-httpd-imagestreams','redhat-redhat-dotnet-imagestreams'. Rest of the names can be obtained from openshift console --\u003e helmcharts --\u003einstalled helmcharts. This will display the list of all the 12 helmcharts(of imagestreams)being installed by Samples Operator. The skippedHelmCharts must be a valid Kubernetes resource name. May contain only lowercase alphanumeric characters, hyphens and periods, and each period separated segment must begin and end with an alphanumeric character. It must be non-empty and at most 253 characters in length", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, + "skippedImagestreams": { + "description": "skippedImagestreams specifies names of image streams that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "skippedTemplates": { + "description": "skippedTemplates specifies names of templates that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "samples.operator.openshift.io", "Version": "v1", - "Kind": "ServiceServingCert", + "Kind": "ConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.openshiftcontrolplane.v1.SourceStrategyDefaultsConfig": { - "description": "SourceStrategyDefaultsConfig contains values that apply to builds using the source strategy.", + "io.openshift.operator.samples.v1.ConfigStatus": { + "description": "ConfigStatus contains the actual configuration in effect, as well as various details that describe the state of the Samples Operator.", "type": "object", "properties": { - "incremental": { - "description": "incremental indicates if s2i build strategies should perform an incremental build or not", - "type": "boolean" + "architectures": { + "description": "architectures determine which hardware architecture(s) to install, where x86_64 and ppc64le are the supported choices.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "conditions": { + "description": "conditions represents the available maintenance status of the sample imagestreams and templates.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.samples.v1.ConfigCondition" + }, + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "managementState": { + "description": "managementState reflects the current operational status of the on/off switch for the operator. This operator compares the ManagementState as part of determining that we are turning the operator back on (i.e. \"Managed\") when it was previously \"Unmanaged\".", + "type": "string", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "samplesRegistry": { + "description": "samplesRegistry allows for the specification of which registry is accessed by the ImageStreams for their image content. Defaults on the content in https://github.com/openshift/library that are pulled into this github repository, but based on our pulling only ocp content it typically defaults to registry.redhat.io.", + "type": "string", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "skippedImagestreams": { + "description": "skippedImagestreams specifies names of image streams that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "skippedTemplates": { + "description": "skippedTemplates specifies names of templates that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "version": { + "description": "version is the value of the operator's payload based version indicator when it was last successfully processed", + "type": "string", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { "Type": "nested", - "Group": "openshiftcontrolplane.config.openshift.io", + "Group": "samples.operator.openshift.io", "Version": "v1", - "Kind": "SourceStrategyDefaultsConfig", + "Kind": "ConfigStatus", "Scope": "Namespaced" } }, @@ -43755,7 +48454,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "oauthAPIServer": { "description": "OAuthAPIServer holds status specific only to oauth-apiserver", @@ -44029,266 +48739,288 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 - }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "CSISnapshotControllerStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.Capability": { - "description": "Capabilities contains set of UI capabilities and their state in the console UI.", - "type": "object", - "required": [ - "name", - "visibility" - ], - "properties": { - "name": { - "description": "name is the unique name of a capability. Available capabilities are LightspeedButton.", - "type": "string", - "default": "" - }, - "visibility": { - "description": "visibility defines the visibility state of the capability.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.CapabilityVisibility" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "Capability", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.CapabilityVisibility": { - "description": "CapabilityVisibility defines the criteria to enable/disable a capability.", - "type": "object", - "required": [ - "state" - ], - "properties": { - "state": { - "description": "state defines if the capability is enabled or disabled in the console UI. Enabling the capability in the console UI is represented by the \"Enabled\" value. Disabling the capability in the console UI is represented by the \"Disabled\" value.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "CapabilityVisibility", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "state", - "fields-to-discriminateBy": {} - } - ] - }, - "io.openshift.operator.v1.ClientTLS": { - "description": "ClientTLS specifies TLS configuration to enable client-to-server authentication, which can be used for mutual TLS.", - "type": "object", - "required": [ - "clientCertificatePolicy", - "clientCA" - ], - "properties": { - "allowedSubjectPatterns": { - "description": "allowedSubjectPatterns specifies a list of regular expressions that should be matched against the distinguished name on a valid client certificate to filter requests. The regular expressions must use PCRE syntax. If this list is empty, no filtering is performed. If the list is nonempty, then at least one pattern must match a client certificate's distinguished name or else the ingress controller rejects the certificate and denies the connection.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "clientCA": { - "description": "clientCA specifies a configmap containing the PEM-encoded CA certificate bundle that should be used to verify a client's certificate. The administrator must create this configmap in the openshift-config namespace.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "clientCertificatePolicy": { - "description": "clientCertificatePolicy specifies whether the ingress controller requires clients to provide certificates. This field accepts the values \"Required\" or \"Optional\".\n\nNote that the ingress controller only checks client certificates for edge-terminated and reencrypt TLS routes; it cannot check certificates for cleartext HTTP or passthrough TLS routes.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "ClientTLS", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.CloudCredential": { - "description": "CloudCredential provides a means to configure an operator to manage CredentialsRequests.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "spec" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.CloudCredentialSpec" - }, - "status": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.CloudCredentialStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "CloudCredential", - "Scope": "Clustered" - } - }, - "io.openshift.operator.v1.CloudCredentialList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.CloudCredential" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "CloudCredentialList", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.CloudCredentialSpec": { - "description": "CloudCredentialSpec is the specification of the desired behavior of the cloud-credential-operator.", - "type": "object", - "required": [ - "managementState" - ], - "properties": { - "credentialsMode": { - "description": "CredentialsMode allows informing CCO that it should not attempt to dynamically determine the root cloud credentials capabilities, and it should just run in the specified mode. It also allows putting the operator into \"manual\" mode if desired. Leaving the field in default mode runs CCO so that the cluster's cloud credentials will be dynamically probed for capabilities (on supported clouds/platforms). Supported modes:\n AWS/Azure/GCP: \"\" (Default), \"Mint\", \"Passthrough\", \"Manual\"\n Others: Do not set value as other platforms only support running in \"Passthrough\"", - "type": "string" - }, - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", - "type": "string", - "default": "" - }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "CloudCredentialSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.CloudCredentialStatus": { - "description": "CloudCredentialStatus defines the observed status of the cloud-credential-operator.", - "type": "object", - "required": [ - "readyReplicas" - ], - "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, "x-kubernetes-list-map-keys": [ - "type" + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "CSISnapshotControllerStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.Capability": { + "description": "Capabilities contains set of UI capabilities and their state in the console UI.", + "type": "object", + "required": [ + "name", + "visibility" + ], + "properties": { + "name": { + "description": "name is the unique name of a capability. Available capabilities are LightspeedButton and GettingStartedBanner.", + "type": "string", + "default": "" + }, + "visibility": { + "description": "visibility defines the visibility state of the capability.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.CapabilityVisibility" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "Capability", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.CapabilityVisibility": { + "description": "CapabilityVisibility defines the criteria to enable/disable a capability.", + "type": "object", + "required": [ + "state" + ], + "properties": { + "state": { + "description": "state defines if the capability is enabled or disabled in the console UI. Enabling the capability in the console UI is represented by the \"Enabled\" value. Disabling the capability in the console UI is represented by the \"Disabled\" value.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "CapabilityVisibility", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "state", + "fields-to-discriminateBy": {} + } + ] + }, + "io.openshift.operator.v1.ClientTLS": { + "description": "ClientTLS specifies TLS configuration to enable client-to-server authentication, which can be used for mutual TLS.", + "type": "object", + "required": [ + "clientCertificatePolicy", + "clientCA" + ], + "properties": { + "allowedSubjectPatterns": { + "description": "allowedSubjectPatterns specifies a list of regular expressions that should be matched against the distinguished name on a valid client certificate to filter requests. The regular expressions must use PCRE syntax. If this list is empty, no filtering is performed. If the list is nonempty, then at least one pattern must match a client certificate's distinguished name or else the ingress controller rejects the certificate and denies the connection.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, + "clientCA": { + "description": "clientCA specifies a configmap containing the PEM-encoded CA certificate bundle that should be used to verify a client's certificate. The administrator must create this configmap in the openshift-config namespace.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "clientCertificatePolicy": { + "description": "clientCertificatePolicy specifies whether the ingress controller requires clients to provide certificates. This field accepts the values \"Required\" or \"Optional\".\n\nNote that the ingress controller only checks client certificates for edge-terminated and reencrypt TLS routes; it cannot check certificates for cleartext HTTP or passthrough TLS routes.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "ClientTLS", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.CloudCredential": { + "description": "CloudCredential provides a means to configure an operator to manage CredentialsRequests.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "spec" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.CloudCredentialSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.CloudCredentialStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "CloudCredential", + "Scope": "Clustered" + } + }, + "io.openshift.operator.v1.CloudCredentialList": { + "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.CloudCredential" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "CloudCredentialList", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.CloudCredentialSpec": { + "description": "CloudCredentialSpec is the specification of the desired behavior of the cloud-credential-operator.", + "type": "object", + "required": [ + "managementState" + ], + "properties": { + "credentialsMode": { + "description": "CredentialsMode allows informing CCO that it should not attempt to dynamically determine the root cloud credentials capabilities, and it should just run in the specified mode. It also allows putting the operator into \"manual\" mode if desired. Leaving the field in default mode runs CCO so that the cluster's cloud credentials will be dynamically probed for capabilities (on supported clouds/platforms). Supported modes:\n AWS/Azure/GCP: \"\" (Default), \"Mint\", \"Passthrough\", \"Manual\"\n Others: Do not set value as other platforms only support running in \"Passthrough\"", + "type": "string" + }, + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", + "type": "string", + "default": "" + }, + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "CloudCredentialSpec", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.CloudCredentialStatus": { + "description": "CloudCredentialStatus defines the observed status of the cloud-credential-operator.", + "type": "object", + "required": [ + "readyReplicas" + ], + "properties": { + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" + }, + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" ], "x-kubernetes-list-type": "map" }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -44463,7 +49195,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -44654,7 +49397,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -44754,7 +49508,7 @@ "type": "string" }, "capabilities": { - "description": "capabilities defines an array of capabilities that can be interacted with in the console UI. Each capability defines a visual state that can be interacted with the console to render in the UI. Available capabilities are LightspeedButton. Each of the available capabilities may appear only once in the list.", + "description": "capabilities defines an array of capabilities that can be interacted with in the console UI. Each capability defines a visual state that can be interacted with the console to render in the UI. Available capabilities are LightspeedButton and GettingStartedBanner. Each of the available capabilities may appear only once in the list.", "type": "array", "items": { "default": {}, @@ -44962,7 +49716,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -45692,7 +50457,13 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, "latestAvailableRevision": { "description": "latestAvailableRevision is the deploymentID of the most recent deployment", @@ -46178,829 +50949,198 @@ ], "properties": { "encryptionKeyCRN": { - "description": "encryptionKeyCRN is the IBM Cloud CRN of the customer-managed root key to use for disk encryption of volumes for the default storage classes.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IBMCloudCSIDriverConfigSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IBMLoadBalancerParameters": { - "description": "IBMLoadBalancerParameters provides configuration settings that are specific to IBM Cloud load balancers.", - "type": "object", - "properties": { - "protocol": { - "description": "protocol specifies whether the load balancer uses PROXY protocol to forward connections to the IngressController. See \"service.kubernetes.io/ibm-load-balancer-cloud-provider-enable-features: \"proxy-protocol\"\" at https://cloud.ibm.com/docs/containers?topic=containers-vpc-lbaas\"\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nValid values for protocol are TCP, PROXY and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is TCP, without the proxy protocol enabled.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IBMLoadBalancerParameters", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPAMConfig": { - "description": "IPAMConfig contains configurations for IPAM (IP Address Management)", - "type": "object", - "required": [ - "type" - ], - "properties": { - "staticIPAMConfig": { - "description": "StaticIPAMConfig configures the static IP address in case of type:IPAMTypeStatic", - "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMConfig" - }, - "type": { - "description": "Type is the type of IPAM module will be used for IP Address Management(IPAM). The supported values are IPAMTypeDHCP, IPAMTypeStatic", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPAMConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPFIXConfig": { - "type": "object", - "properties": { - "collectors": { - "description": "ipfixCollectors is list of strings formatted as ip:port with a maximum of ten items", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPFIXConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPsecConfig": { - "type": "object", - "properties": { - "mode": { - "description": "mode defines the behaviour of the ipsec configuration within the platform. Valid values are `Disabled`, `External` and `Full`. When 'Disabled', ipsec will not be enabled at the node level. When 'External', ipsec is enabled on the node level but requires the user to configure the secure communication parameters. This mode is for external secure communications and the configuration can be done using the k8s-nmstate operator. When 'Full', ipsec is configured on the node level and inter-pod secure communication within the cluster is configured. Note with `Full`, if ipsec is desired for communication with external (to the cluster) entities (such as storage arrays), this is left to the user to configure.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPsecConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPv4GatewayConfig": { - "description": "IPV4GatewayConfig holds the configuration paramaters for IPV4 connections in the GatewayConfig for OVN-Kubernetes", - "type": "object", - "properties": { - "internalMasqueradeSubnet": { - "description": "internalMasqueradeSubnet contains the masquerade addresses in IPV4 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /29). When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 169.254.169.0/29 The value must be in proper IPV4 CIDR format", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPv4GatewayConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPv4OVNKubernetesConfig": { - "type": "object", - "properties": { - "internalJoinSubnet": { - "description": "internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. The current default value is 100.64.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format", - "type": "string" - }, - "internalTransitSwitchSubnet": { - "description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 100.88.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPv4OVNKubernetesConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPv6GatewayConfig": { - "description": "IPV6GatewayConfig holds the configuration paramaters for IPV6 connections in the GatewayConfig for OVN-Kubernetes", - "type": "object", - "properties": { - "internalMasqueradeSubnet": { - "description": "internalMasqueradeSubnet contains the masquerade addresses in IPV6 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /125). When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is fd69::/125 Note that IPV6 dual addresses are not permitted", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPv6GatewayConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IPv6OVNKubernetesConfig": { - "type": "object", - "properties": { - "internalJoinSubnet": { - "description": "internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. The subnet must be large enough to accomadate one IP per node in your cluster The current default value is fd98::/48 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted", - "type": "string" - }, - "internalTransitSwitchSubnet": { - "description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The subnet must be large enough to accomadate one IP per node in your cluster The current default subnet is fd97::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IPv6OVNKubernetesConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.Ingress": { - "description": "Ingress allows cluster admin to configure alternative ingress for the console.", - "type": "object", - "properties": { - "clientDownloadsURL": { - "description": "clientDownloadsURL is a URL to be used as the address to download client binaries. If not specified, the downloads route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", - "type": "string", - "default": "" - }, - "consoleURL": { - "description": "consoleURL is a URL to be used as the base console address. If not specified, the console route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. Make sure that appropriate ingress is set up at this URL. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "Ingress", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IngressController": { - "description": "IngressController describes a managed ingress controller for the cluster. The controller can service OpenShift Route and Kubernetes Ingress resources.\n\nWhen an IngressController is created, a new ingress controller deployment is created to allow external traffic to reach the services that expose Ingress or Route resources. Updating this resource may lead to disruption for public facing network connections as a new ingress controller revision may be rolled out.\n\nhttps://kubernetes.io/docs/concepts/services-networking/ingress-controllers\n\nWhenever possible, sensible defaults for the platform are used. See each field for more details.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec is the specification of the desired behavior of the IngressController.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerSpec" - }, - "status": { - "description": "status is the most recently observed status of the IngressController.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressController", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IngressControllerCaptureHTTPCookie": { - "description": "IngressControllerCaptureHTTPCookie describes an HTTP cookie that should be captured.", - "type": "object", - "required": [ - "maxLength" - ], - "properties": { - "matchType": { - "description": "matchType specifies the type of match to be performed on the cookie name. Allowed values are \"Exact\" for an exact string match and \"Prefix\" for a string prefix match. If \"Exact\" is specified, a name must be specified in the name field. If \"Prefix\" is provided, a prefix must be specified in the namePrefix field. For example, specifying matchType \"Prefix\" and namePrefix \"foo\" will capture a cookie named \"foo\" or \"foobar\" but not one named \"bar\". The first matching cookie is captured.", - "type": "string" - }, - "maxLength": { - "description": "maxLength specifies a maximum length of the string that will be logged, which includes the cookie name, cookie value, and one-character delimiter. If the log entry exceeds this length, the value will be truncated in the log message. Note that the ingress controller may impose a separate bound on the total length of HTTP headers in a request.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "name": { - "description": "name specifies a cookie name. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", - "type": "string", - "default": "" - }, - "namePrefix": { - "description": "namePrefix specifies a cookie name prefix. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressControllerCaptureHTTPCookie", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "matchType", - "fields-to-discriminateBy": { - "name": "Name", - "namePrefix": "NamePrefix" - } - } - ] - }, - "io.openshift.operator.v1.IngressControllerCaptureHTTPCookieUnion": { - "description": "IngressControllerCaptureHTTPCookieUnion describes optional fields of an HTTP cookie that should be captured.", - "type": "object", - "properties": { - "matchType": { - "description": "matchType specifies the type of match to be performed on the cookie name. Allowed values are \"Exact\" for an exact string match and \"Prefix\" for a string prefix match. If \"Exact\" is specified, a name must be specified in the name field. If \"Prefix\" is provided, a prefix must be specified in the namePrefix field. For example, specifying matchType \"Prefix\" and namePrefix \"foo\" will capture a cookie named \"foo\" or \"foobar\" but not one named \"bar\". The first matching cookie is captured.", - "type": "string" - }, - "name": { - "description": "name specifies a cookie name. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", - "type": "string", - "default": "" - }, - "namePrefix": { - "description": "namePrefix specifies a cookie name prefix. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressControllerCaptureHTTPCookieUnion", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "matchType", - "fields-to-discriminateBy": { - "name": "Name", - "namePrefix": "NamePrefix" - } - } - ] - }, - "io.openshift.operator.v1.IngressControllerCaptureHTTPHeader": { - "description": "IngressControllerCaptureHTTPHeader describes an HTTP header that should be captured.", - "type": "object", - "required": [ - "name", - "maxLength" - ], - "properties": { - "maxLength": { - "description": "maxLength specifies a maximum length for the header value. If a header value exceeds this length, the value will be truncated in the log message. Note that the ingress controller may impose a separate bound on the total length of HTTP headers in a request.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "name": { - "description": "name specifies a header name. Its value must be a valid HTTP header name as defined in RFC 2616 section 4.2.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressControllerCaptureHTTPHeader", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IngressControllerCaptureHTTPHeaders": { - "description": "IngressControllerCaptureHTTPHeaders specifies which HTTP headers the IngressController captures.", - "type": "object", - "properties": { - "request": { - "description": "request specifies which HTTP request headers to capture.\n\nIf this field is empty, no request headers are captured.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerCaptureHTTPHeader" - }, - "x-kubernetes-list-type": "atomic" - }, - "response": { - "description": "response specifies which HTTP response headers to capture.\n\nIf this field is empty, no response headers are captured.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerCaptureHTTPHeader" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressControllerCaptureHTTPHeaders", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IngressControllerHTTPHeader": { - "description": "IngressControllerHTTPHeader specifies configuration for setting or deleting an HTTP header.", - "type": "object", - "required": [ - "name", - "action" - ], - "properties": { - "action": { - "description": "action specifies actions to perform on headers, such as setting or deleting headers.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeaderActionUnion" - }, - "name": { - "description": "name specifies the name of a header on which to perform an action. Its value must be a valid HTTP header name as defined in RFC 2616 section 4.2. The name must consist only of alphanumeric and the following special characters, \"-!#$%\u0026'*+.^_`\". The following header names are reserved and may not be modified via this API: Strict-Transport-Security, Proxy, Host, Cookie, Set-Cookie. It must be no more than 255 characters in length. Header name must be unique.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressControllerHTTPHeader", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.IngressControllerHTTPHeaderActionUnion": { - "description": "IngressControllerHTTPHeaderActionUnion specifies an action to take on an HTTP header.", - "type": "object", - "required": [ - "type" - ], - "properties": { - "set": { - "description": "set specifies how the HTTP header should be set. This field is required when type is Set and forbidden otherwise.", - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerSetHTTPHeader" - }, - "type": { - "description": "type defines the type of the action to be applied on the header. Possible values are Set or Delete. Set allows you to set HTTP request and response headers. Delete allows you to delete HTTP request and response headers.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "IngressControllerHTTPHeaderActionUnion", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "set": "Set" - } - } - ] - }, - "io.openshift.operator.v1.IngressControllerHTTPHeaderActions": { - "description": "IngressControllerHTTPHeaderActions defines configuration for actions on HTTP request and response headers.", - "type": "object", - "properties": { - "request": { - "description": "request is a list of HTTP request headers to modify. Actions defined here will modify the request headers of all requests passing through an ingress controller. These actions are applied to all Routes i.e. for all connections handled by the ingress controller defined within a cluster. IngressController actions for request headers will be executed before Route actions. Currently, actions may define to either `Set` or `Delete` headers values. Actions are applied in sequence as defined in this list. A maximum of 20 request header actions may be configured. Sample fetchers allowed are \"req.hdr\" and \"ssl_c_der\". Converters allowed are \"lower\" and \"base64\". Example header values: \"%[req.hdr(X-target),lower]\", \"%{+Q}[ssl_c_der,base64]\".", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeader" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" - }, - "response": { - "description": "response is a list of HTTP response headers to modify. Actions defined here will modify the response headers of all requests passing through an ingress controller. These actions are applied to all Routes i.e. for all connections handled by the ingress controller defined within a cluster. IngressController actions for response headers will be executed after Route actions. Currently, actions may define to either `Set` or `Delete` headers values. Actions are applied in sequence as defined in this list. A maximum of 20 response header actions may be configured. Sample fetchers allowed are \"res.hdr\" and \"ssl_c_der\". Converters allowed are \"lower\" and \"base64\". Example header values: \"%[res.hdr(X-target),lower]\", \"%{+Q}[ssl_c_der,base64]\".", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeader" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "description": "encryptionKeyCRN is the IBM Cloud CRN of the customer-managed root key to use for disk encryption of volumes for the default storage classes.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerHTTPHeaderActions", + "Kind": "IBMCloudCSIDriverConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerHTTPHeaders": { - "description": "IngressControllerHTTPHeaders specifies how the IngressController handles certain HTTP headers.", + "io.openshift.operator.v1.IBMLoadBalancerParameters": { + "description": "IBMLoadBalancerParameters provides configuration settings that are specific to IBM Cloud load balancers.", "type": "object", "properties": { - "actions": { - "description": "actions specifies options for modifying headers and their values. Note that this option only applies to cleartext HTTP connections and to secure HTTP connections for which the ingress controller terminates encryption (that is, edge-terminated or reencrypt connections). Headers cannot be modified for TLS passthrough connections. Setting the HSTS (`Strict-Transport-Security`) header is not supported via actions. `Strict-Transport-Security` may only be configured using the \"haproxy.router.openshift.io/hsts_header\" route annotation, and only in accordance with the policy specified in Ingress.Spec.RequiredHSTSPolicies. Any actions defined here are applied after any actions related to the following other fields: cache-control, spec.clientTLS, spec.httpHeaders.forwardedHeaderPolicy, spec.httpHeaders.uniqueId, and spec.httpHeaders.headerNameCaseAdjustments. In case of HTTP request headers, the actions specified in spec.httpHeaders.actions on the Route will be executed after the actions specified in the IngressController's spec.httpHeaders.actions field. In case of HTTP response headers, the actions specified in spec.httpHeaders.actions on the IngressController will be executed after the actions specified in the Route's spec.httpHeaders.actions field. Headers set using this API cannot be captured for use in access logs. The following header names are reserved and may not be modified via this API: Strict-Transport-Security, Proxy, Host, Cookie, Set-Cookie. Note that the total size of all net added headers *after* interpolating dynamic values must not exceed the value of spec.tuningOptions.headerBufferMaxRewriteBytes on the IngressController. Please refer to the documentation for that API field for more details.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeaderActions" - }, - "forwardedHeaderPolicy": { - "description": "forwardedHeaderPolicy specifies when and how the IngressController sets the Forwarded, X-Forwarded-For, X-Forwarded-Host, X-Forwarded-Port, X-Forwarded-Proto, and X-Forwarded-Proto-Version HTTP headers. The value may be one of the following:\n\n* \"Append\", which specifies that the IngressController appends the\n headers, preserving existing headers.\n\n* \"Replace\", which specifies that the IngressController sets the\n headers, replacing any existing Forwarded or X-Forwarded-* headers.\n\n* \"IfNone\", which specifies that the IngressController sets the\n headers if they are not already set.\n\n* \"Never\", which specifies that the IngressController never sets the\n headers, preserving any existing headers.\n\nBy default, the policy is \"Append\".", + "protocol": { + "description": "protocol specifies whether the load balancer uses PROXY protocol to forward connections to the IngressController. See \"service.kubernetes.io/ibm-load-balancer-cloud-provider-enable-features: \"proxy-protocol\"\" at https://cloud.ibm.com/docs/containers?topic=containers-vpc-lbaas\"\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nValid values for protocol are TCP, PROXY and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is TCP, without the proxy protocol enabled.", "type": "string" - }, - "headerNameCaseAdjustments": { - "description": "headerNameCaseAdjustments specifies case adjustments that can be applied to HTTP header names. Each adjustment is specified as an HTTP header name with the desired capitalization. For example, specifying \"X-Forwarded-For\" indicates that the \"x-forwarded-for\" HTTP header should be adjusted to have the specified capitalization.\n\nThese adjustments are only applied to cleartext, edge-terminated, and re-encrypt routes, and only when using HTTP/1.\n\nFor request headers, these adjustments are applied only for routes that have the haproxy.router.openshift.io/h1-adjust-case=true annotation. For response headers, these adjustments are applied to all HTTP responses.\n\nIf this field is empty, no request headers are adjusted.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - }, - "uniqueId": { - "description": "uniqueId describes configuration for a custom HTTP header that the ingress controller should inject into incoming HTTP requests. Typically, this header is configured to have a value that is unique to the HTTP request. The header can be used by applications or included in access logs to facilitate tracing individual HTTP requests.\n\nIf this field is empty, no such header is injected into requests.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPUniqueIdHeaderPolicy" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerHTTPHeaders", + "Kind": "IBMLoadBalancerParameters", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerHTTPUniqueIdHeaderPolicy": { - "description": "IngressControllerHTTPUniqueIdHeaderPolicy describes configuration for a unique id header.", + "io.openshift.operator.v1.IPAMConfig": { + "description": "IPAMConfig contains configurations for IPAM (IP Address Management)", "type": "object", + "required": [ + "type" + ], "properties": { - "format": { - "description": "format specifies the format for the injected HTTP header's value. This field has no effect unless name is specified. For the HAProxy-based ingress controller implementation, this format uses the same syntax as the HTTP log format. If the field is empty, the default value is \"%{+X}o\\ %ci:%cp_%fi:%fp_%Ts_%rt:%pid\"; see the corresponding HAProxy documentation: http://cbonte.github.io/haproxy-dconv/2.0/configuration.html#8.2.3", - "type": "string" + "staticIPAMConfig": { + "description": "StaticIPAMConfig configures the static IP address in case of type:IPAMTypeStatic", + "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMConfig" }, - "name": { - "description": "name specifies the name of the HTTP header (for example, \"unique-id\") that the ingress controller should inject into HTTP requests. The field's value must be a valid HTTP header name as defined in RFC 2616 section 4.2. If the field is empty, no header is injected.", - "type": "string" + "type": { + "description": "Type is the type of IPAM module will be used for IP Address Management(IPAM). The supported values are IPAMTypeDHCP, IPAMTypeStatic", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerHTTPUniqueIdHeaderPolicy", + "Kind": "IPAMConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerList": { - "description": "IngressControllerList contains a list of IngressControllers.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IPFIXConfig": { "type": "object", - "required": [ - "items" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { + "collectors": { + "description": "ipfixCollectors is list of strings formatted as ip:port with a maximum of ten items", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressController" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerList", + "Kind": "IPFIXConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerLogging": { - "description": "IngressControllerLogging describes what should be logged where.", + "io.openshift.operator.v1.IPsecConfig": { "type": "object", "properties": { - "access": { - "description": "access describes how the client requests should be logged.\n\nIf this field is empty, access logging is disabled.", - "$ref": "#/definitions/io.openshift.operator.v1.AccessLogging" + "mode": { + "description": "mode defines the behaviour of the ipsec configuration within the platform. Valid values are `Disabled`, `External` and `Full`. When 'Disabled', ipsec will not be enabled at the node level. When 'External', ipsec is enabled on the node level but requires the user to configure the secure communication parameters. This mode is for external secure communications and the configuration can be done using the k8s-nmstate operator. When 'Full', ipsec is configured on the node level and inter-pod secure communication within the cluster is configured. Note with `Full`, if ipsec is desired for communication with external (to the cluster) entities (such as storage arrays), this is left to the user to configure.", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerLogging", + "Kind": "IPsecConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerSetHTTPHeader": { - "description": "IngressControllerSetHTTPHeader defines the value which needs to be set on an HTTP header.", + "io.openshift.operator.v1.IPv4GatewayConfig": { + "description": "IPV4GatewayConfig holds the configuration paramaters for IPV4 connections in the GatewayConfig for OVN-Kubernetes", "type": "object", - "required": [ - "value" - ], "properties": { - "value": { - "description": "value specifies a header value. Dynamic values can be added. The value will be interpreted as an HAProxy format string as defined in http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#8.2.6 and may use HAProxy's %[] syntax and otherwise must be a valid HTTP header value as defined in https://datatracker.ietf.org/doc/html/rfc7230#section-3.2. The value of this field must be no more than 16384 characters in length. Note that the total size of all net added headers *after* interpolating dynamic values must not exceed the value of spec.tuningOptions.headerBufferMaxRewriteBytes on the IngressController.", - "type": "string", - "default": "" + "internalMasqueradeSubnet": { + "description": "internalMasqueradeSubnet contains the masquerade addresses in IPV4 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /29). When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 169.254.169.0/29 The value must be in proper IPV4 CIDR format", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerSetHTTPHeader", + "Kind": "IPv4GatewayConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerSpec": { - "description": "IngressControllerSpec is the specification of the desired behavior of the IngressController.", + "io.openshift.operator.v1.IPv4OVNKubernetesConfig": { "type": "object", "properties": { - "clientTLS": { - "description": "clientTLS specifies settings for requesting and verifying client certificates, which can be used to enable mutual TLS for edge-terminated and reencrypt routes.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ClientTLS" - }, - "defaultCertificate": { - "description": "defaultCertificate is a reference to a secret containing the default certificate served by the ingress controller. When Routes don't specify their own certificate, defaultCertificate is used.\n\nThe secret must contain the following keys and data:\n\n tls.crt: certificate file contents\n tls.key: key file contents\n\nIf unset, a wildcard certificate is automatically generated and used. The certificate is valid for the ingress controller domain (and subdomains) and the generated certificate's CA will be automatically integrated with the cluster's trust store.\n\nIf a wildcard certificate is used and shared by multiple HTTP/2 enabled routes (which implies ALPN) then clients (i.e., notably browsers) are at liberty to reuse open connections. This means a client can reuse a connection to another route and that is likely to fail. This behaviour is generally known as connection coalescing.\n\nThe in-use certificate (whether generated or user-specified) will be automatically integrated with OpenShift's built-in OAuth server.", - "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" - }, - "domain": { - "description": "domain is a DNS name serviced by the ingress controller and is used to configure multiple features:\n\n* For the LoadBalancerService endpoint publishing strategy, domain is\n used to configure DNS records. See endpointPublishingStrategy.\n\n* When using a generated default certificate, the certificate will be valid\n for domain and its subdomains. See defaultCertificate.\n\n* The value is published to individual Route statuses so that end-users\n know where to target external DNS records.\n\ndomain must be unique among all IngressControllers, and cannot be updated.\n\nIf empty, defaults to ingress.config.openshift.io/cluster .spec.domain.", + "internalJoinSubnet": { + "description": "internalJoinSubnet is a v4 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. The current default value is 100.64.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format", "type": "string" }, - "endpointPublishingStrategy": { - "description": "endpointPublishingStrategy is used to publish the ingress controller endpoints to other networks, enable load balancer integrations, etc.\n\nIf unset, the default is based on infrastructure.config.openshift.io/cluster .status.platform:\n\n AWS: LoadBalancerService (with External scope)\n Azure: LoadBalancerService (with External scope)\n GCP: LoadBalancerService (with External scope)\n IBMCloud: LoadBalancerService (with External scope)\n AlibabaCloud: LoadBalancerService (with External scope)\n Libvirt: HostNetwork\n\nAny other platform types (including None) default to HostNetwork.\n\nendpointPublishingStrategy cannot be updated.", - "$ref": "#/definitions/io.openshift.operator.v1.EndpointPublishingStrategy" - }, - "httpCompression": { - "description": "httpCompression defines a policy for HTTP traffic compression. By default, there is no HTTP compression.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.HTTPCompressionPolicy" - }, - "httpEmptyRequestsPolicy": { - "description": "httpEmptyRequestsPolicy describes how HTTP connections should be handled if the connection times out before a request is received. Allowed values for this field are \"Respond\" and \"Ignore\". If the field is set to \"Respond\", the ingress controller sends an HTTP 400 or 408 response, logs the connection (if access logging is enabled), and counts the connection in the appropriate metrics. If the field is set to \"Ignore\", the ingress controller closes the connection without sending a response, logging the connection, or incrementing metrics. The default value is \"Respond\".\n\nTypically, these connections come from load balancers' health probes or Web browsers' speculative connections (\"preconnect\") and can be safely ignored. However, these requests may also be caused by network errors, and so setting this field to \"Ignore\" may impede detection and diagnosis of problems. In addition, these requests may be caused by port scans, in which case logging empty requests may aid in detecting intrusion attempts.", + "internalTransitSwitchSubnet": { + "description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is 100.88.0.0/16 The subnet must be large enough to accomadate one IP per node in your cluster The value must be in proper IPV4 CIDR format", "type": "string" - }, - "httpErrorCodePages": { - "description": "httpErrorCodePages specifies a configmap with custom error pages. The administrator must create this configmap in the openshift-config namespace. This configmap should have keys in the format \"error-page-\u003cerror code\u003e.http\", where \u003cerror code\u003e is an HTTP error code. For example, \"error-page-503.http\" defines an error page for HTTP 503 responses. Currently only error pages for 503 and 404 responses can be customized. Each value in the configmap should be the full response, including HTTP headers. Eg- https://raw.githubusercontent.com/openshift/router/fadab45747a9b30cc3f0a4b41ad2871f95827a93/images/router/haproxy/conf/error-page-503.http If this field is empty, the ingress controller uses the default error pages.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" - }, - "httpHeaders": { - "description": "httpHeaders defines policy for HTTP headers.\n\nIf this field is empty, the default values are used.", - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeaders" - }, - "logging": { - "description": "logging defines parameters for what should be logged where. If this field is empty, operational logs are enabled but access logs are disabled.", - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerLogging" - }, - "namespaceSelector": { - "description": "namespaceSelector is used to filter the set of namespaces serviced by the ingress controller. This is useful for implementing shards.\n\nIf unset, the default is no filtering.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - }, - "nodePlacement": { - "description": "nodePlacement enables explicit control over the scheduling of the ingress controller.\n\nIf unset, defaults are used. See NodePlacement for more details.", - "$ref": "#/definitions/io.openshift.operator.v1.NodePlacement" - }, - "replicas": { - "description": "replicas is the desired number of ingress controller replicas. If unset, the default depends on the value of the defaultPlacement field in the cluster config.openshift.io/v1/ingresses status.\n\nThe value of replicas is set based on the value of a chosen field in the Infrastructure CR. If defaultPlacement is set to ControlPlane, the chosen field will be controlPlaneTopology. If it is set to Workers the chosen field will be infrastructureTopology. Replicas will then be set to 1 or 2 based whether the chosen field's value is SingleReplica or HighlyAvailable, respectively.\n\nThese defaults are subject to change.", - "type": "integer", - "format": "int32" - }, - "routeAdmission": { - "description": "routeAdmission defines a policy for handling new route claims (for example, to allow or deny claims across namespaces).\n\nIf empty, defaults will be applied. See specific routeAdmission fields for details about their defaults.", - "$ref": "#/definitions/io.openshift.operator.v1.RouteAdmissionPolicy" - }, - "routeSelector": { - "description": "routeSelector is used to filter the set of Routes serviced by the ingress controller. This is useful for implementing shards.\n\nIf unset, the default is no filtering.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - }, - "tlsSecurityProfile": { - "description": "tlsSecurityProfile specifies settings for TLS connections for ingresscontrollers.\n\nIf unset, the default is based on the apiservers.config.openshift.io/cluster resource.\n\nNote that when using the Old, Intermediate, and Modern profile types, the effective profile configuration is subject to change between releases. For example, given a specification to use the Intermediate profile deployed on release X.Y.Z, an upgrade to release X.Y.Z+1 may cause a new profile configuration to be applied to the ingress controller, resulting in a rollout.", - "$ref": "#/definitions/io.openshift.config.v1.TLSSecurityProfile" - }, - "tuningOptions": { - "description": "tuningOptions defines parameters for adjusting the performance of ingress controller pods. All fields are optional and will use their respective defaults if not set. See specific tuningOptions fields for more details.\n\nSetting fields within tuningOptions is generally not recommended. The default values are suitable for most configurations.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerTuningOptions" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides allows specifying unsupported configuration options. Its use is unsupported.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerSpec", + "Kind": "IPv4OVNKubernetesConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerStatus": { - "description": "IngressControllerStatus defines the observed status of the IngressController.", + "io.openshift.operator.v1.IPv6GatewayConfig": { + "description": "IPV6GatewayConfig holds the configuration paramaters for IPV6 connections in the GatewayConfig for OVN-Kubernetes", "type": "object", - "required": [ - "availableReplicas", - "selector", - "domain" - ], "properties": { - "availableReplicas": { - "description": "availableReplicas is number of observed available replicas according to the ingress controller deployment.", - "type": "integer", - "format": "int32", - "default": 0 - }, - "conditions": { - "description": "conditions is a list of conditions and their status.\n\nAvailable means the ingress controller deployment is available and servicing route and ingress resources (i.e, .status.availableReplicas equals .spec.replicas)\n\nThere are additional conditions which indicate the status of other ingress controller features and capabilities.\n\n * LoadBalancerManaged\n - True if the following conditions are met:\n * The endpoint publishing strategy requires a service load balancer.\n - False if any of those conditions are unsatisfied.\n\n * LoadBalancerReady\n - True if the following conditions are met:\n * A load balancer is managed.\n * The load balancer is ready.\n - False if any of those conditions are unsatisfied.\n\n * DNSManaged\n - True if the following conditions are met:\n * The endpoint publishing strategy and platform support DNS.\n * The ingress controller domain is set.\n * dns.config.openshift.io/cluster configures DNS zones.\n - False if any of those conditions are unsatisfied.\n\n * DNSReady\n - True if the following conditions are met:\n * DNS is managed.\n * DNS records have been successfully created.\n - False if any of those conditions are unsatisfied.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "domain": { - "description": "domain is the actual domain in use.", - "type": "string", - "default": "" - }, - "endpointPublishingStrategy": { - "description": "endpointPublishingStrategy is the actual strategy in use.", - "$ref": "#/definitions/io.openshift.operator.v1.EndpointPublishingStrategy" - }, - "namespaceSelector": { - "description": "namespaceSelector is the actual namespaceSelector in use.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - }, - "observedGeneration": { - "description": "observedGeneration is the most recent generation observed.", - "type": "integer", - "format": "int64" - }, - "routeSelector": { - "description": "routeSelector is the actual routeSelector in use.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - }, - "selector": { - "description": "selector is a label selector, in string format, for ingress controller pods corresponding to the IngressController. The number of matching pods should equal the value of availableReplicas.", - "type": "string", - "default": "" - }, - "tlsProfile": { - "description": "tlsProfile is the TLS connection configuration that is in effect.", - "$ref": "#/definitions/io.openshift.config.v1.TLSProfileSpec" + "internalMasqueradeSubnet": { + "description": "internalMasqueradeSubnet contains the masquerade addresses in IPV6 CIDR format used internally by ovn-kubernetes to enable host to service traffic. Each host in the cluster is configured with these addresses, as well as the shared gateway bridge interface. The values can be changed after installation. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. Additionally the subnet must be large enough to accommodate 6 IPs (maximum prefix length /125). When omitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The current default subnet is fd69::/125 Note that IPV6 dual addresses are not permitted", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerStatus", + "Kind": "IPv6GatewayConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.IngressControllerTuningOptions": { - "description": "IngressControllerTuningOptions specifies options for tuning the performance of ingress controller pods", + "io.openshift.operator.v1.IPv6OVNKubernetesConfig": { "type": "object", "properties": { - "clientFinTimeout": { - "description": "clientFinTimeout defines how long a connection will be held open while waiting for the client response to the server/backend closing the connection.\n\nIf unset, the default timeout is 1s", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "clientTimeout": { - "description": "clientTimeout defines how long a connection will be held open while waiting for a client response.\n\nIf unset, the default timeout is 30s", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "connectTimeout": { - "description": "ConnectTimeout defines the maximum time to wait for a connection attempt to a server/backend to succeed.\n\nThis field expects an unsigned duration string of decimal numbers, each with optional fraction and a unit suffix, e.g. \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".\n\nWhen omitted, this means the user has no opinion and the platform is left to choose a reasonable default. This default is subject to change over time. The current default is 5s.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "headerBufferBytes": { - "description": "headerBufferBytes describes how much memory should be reserved (in bytes) for IngressController connection sessions. Note that this value must be at least 16384 if HTTP/2 is enabled for the IngressController (https://tools.ietf.org/html/rfc7540). If this field is empty, the IngressController will use a default value of 32768 bytes.\n\nSetting this field is generally not recommended as headerBufferBytes values that are too small may break the IngressController and headerBufferBytes values that are too large could cause the IngressController to use significantly more memory than necessary.", - "type": "integer", - "format": "int32" - }, - "headerBufferMaxRewriteBytes": { - "description": "headerBufferMaxRewriteBytes describes how much memory should be reserved (in bytes) from headerBufferBytes for HTTP header rewriting and appending for IngressController connection sessions. Note that incoming HTTP requests will be limited to (headerBufferBytes - headerBufferMaxRewriteBytes) bytes, meaning headerBufferBytes must be greater than headerBufferMaxRewriteBytes. If this field is empty, the IngressController will use a default value of 8192 bytes.\n\nSetting this field is generally not recommended as headerBufferMaxRewriteBytes values that are too small may break the IngressController and headerBufferMaxRewriteBytes values that are too large could cause the IngressController to use significantly more memory than necessary.", - "type": "integer", - "format": "int32" - }, - "healthCheckInterval": { - "description": "healthCheckInterval defines how long the router waits between two consecutive health checks on its configured backends. This value is applied globally as a default for all routes, but may be overridden per-route by the route annotation \"router.openshift.io/haproxy.health.check.interval\".\n\nExpects an unsigned duration string of decimal numbers, each with optional fraction and a unit suffix, eg \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".\n\nSetting this to less than 5s can cause excess traffic due to too frequent TCP health checks and accompanying SYN packet storms. Alternatively, setting this too high can result in increased latency, due to backend servers that are no longer available, but haven't yet been detected as such.\n\nAn empty or zero healthCheckInterval means no opinion and IngressController chooses a default, which is subject to change over time. Currently the default healthCheckInterval value is 5s.\n\nCurrently the minimum allowed value is 1s and the maximum allowed value is 2147483647ms (24.85 days). Both are subject to change over time.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "maxConnections": { - "description": "maxConnections defines the maximum number of simultaneous connections that can be established per HAProxy process. Increasing this value allows each ingress controller pod to handle more connections but at the cost of additional system resources being consumed.\n\nPermitted values are: empty, 0, -1, and the range 2000-2000000.\n\nIf this field is empty or 0, the IngressController will use the default value of 50000, but the default is subject to change in future releases.\n\nIf the value is -1 then HAProxy will dynamically compute a maximum value based on the available ulimits in the running container. Selecting -1 (i.e., auto) will result in a large value being computed (~520000 on OpenShift \u003e=4.10 clusters) and therefore each HAProxy process will incur significant memory usage compared to the current default of 50000.\n\nSetting a value that is greater than the current operating system limit will prevent the HAProxy process from starting.\n\nIf you choose a discrete value (e.g., 750000) and the router pod is migrated to a new node, there's no guarantee that that new node has identical ulimits configured. In such a scenario the pod would fail to start. If you have nodes with different ulimits configured (e.g., different tuned profiles) and you choose a discrete value then the guidance is to use -1 and let the value be computed dynamically at runtime.\n\nYou can monitor memory usage for router containers with the following metric: 'container_memory_working_set_bytes{container=\"router\",namespace=\"openshift-ingress\"}'.\n\nYou can monitor memory usage of individual HAProxy processes in router containers with the following metric: 'container_memory_working_set_bytes{container=\"router\",namespace=\"openshift-ingress\"}/container_processes{container=\"router\",namespace=\"openshift-ingress\"}'.", - "type": "integer", - "format": "int32" - }, - "reloadInterval": { - "description": "reloadInterval defines the minimum interval at which the router is allowed to reload to accept new changes. Increasing this value can prevent the accumulation of HAProxy processes, depending on the scenario. Increasing this interval can also lessen load imbalance on a backend's servers when using the roundrobin balancing algorithm. Alternatively, decreasing this value may decrease latency since updates to HAProxy's configuration can take effect more quickly.\n\nThe value must be a time duration value; see \u003chttps://pkg.go.dev/time#ParseDuration\u003e. Currently, the minimum value allowed is 1s, and the maximum allowed value is 120s. Minimum and maximum allowed values may change in future versions of OpenShift. Note that if a duration outside of these bounds is provided, the value of reloadInterval will be capped/floored and not rejected (e.g. a duration of over 120s will be capped to 120s; the IngressController will not reject and replace this disallowed value with the default).\n\nA zero value for reloadInterval tells the IngressController to choose the default, which is currently 5s and subject to change without notice.\n\nThis field expects an unsigned duration string of decimal numbers, each with optional fraction and a unit suffix, e.g. \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".\n\nNote: Setting a value significantly larger than the default of 5s can cause latency in observing updates to routes and their endpoints. HAProxy's configuration will be reloaded less frequently, and newly created routes will not be served until the subsequent reload.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "serverFinTimeout": { - "description": "serverFinTimeout defines how long a connection will be held open while waiting for the server/backend response to the client closing the connection.\n\nIf unset, the default timeout is 1s", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "serverTimeout": { - "description": "serverTimeout defines how long a connection will be held open while waiting for a server/backend response.\n\nIf unset, the default timeout is 30s", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "threadCount": { - "description": "threadCount defines the number of threads created per HAProxy process. Creating more threads allows each ingress controller pod to handle more connections, at the cost of more system resources being used. HAProxy currently supports up to 64 threads. If this field is empty, the IngressController will use the default value. The current default is 4 threads, but this may change in future releases.\n\nSetting this field is generally not recommended. Increasing the number of HAProxy threads allows ingress controller pods to utilize more CPU time under load, potentially starving other pods if set too high. Reducing the number of threads may cause the ingress controller to perform poorly.", - "type": "integer", - "format": "int32" + "internalJoinSubnet": { + "description": "internalJoinSubnet is a v6 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. The subnet must be large enough to accomadate one IP per node in your cluster The current default value is fd98::/48 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted", + "type": "string" }, - "tlsInspectDelay": { - "description": "tlsInspectDelay defines how long the router can hold data to find a matching route.\n\nSetting this too short can cause the router to fall back to the default certificate for edge-terminated or reencrypt routes even when a better matching certificate could be used.\n\nIf unset, the default inspect delay is 5s", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "internalTransitSwitchSubnet": { + "description": "internalTransitSwitchSubnet is a v4 subnet in IPV4 CIDR format used internally by OVN-Kubernetes for the distributed transit switch in the OVN Interconnect architecture that connects the cluster routers on each node together to enable east west traffic. The subnet chosen should not overlap with other networks specified for OVN-Kubernetes as well as other networks used on the host. The value cannot be changed after installation. When ommitted, this means no opinion and the platform is left to choose a reasonable default which is subject to change over time. The subnet must be large enough to accomadate one IP per node in your cluster The current default subnet is fd97::/64 The value must be in proper IPV6 CIDR format Note that IPV6 dual addresses are not permitted", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "IPv6OVNKubernetesConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.Ingress": { + "description": "Ingress allows cluster admin to configure alternative ingress for the console.", + "type": "object", + "properties": { + "clientDownloadsURL": { + "description": "clientDownloadsURL is a URL to be used as the address to download client binaries. If not specified, the downloads route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", + "type": "string", + "default": "" }, - "tunnelTimeout": { - "description": "tunnelTimeout defines how long a tunnel connection (including websockets) will be held open while the tunnel is idle.\n\nIf unset, the default timeout is 1h", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "consoleURL": { + "description": "consoleURL is a URL to be used as the base console address. If not specified, the console route hostname will be used. This field is required for clusters without ingress capability, where access to routes is not possible. Make sure that appropriate ingress is set up at this URL. The console operator will monitor the URL and may go degraded if it's unreachable for an extended period. Must use the HTTPS scheme.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "IngressControllerTuningOptions", + "Kind": "Ingress", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.InsightsOperator": { - "description": "InsightsOperator holds cluster-wide information about the Insights Operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IngressController": { + "description": "IngressController describes a managed ingress controller for the cluster. The controller can service OpenShift Route and Kubernetes Ingress resources.\n\nWhen an IngressController is created, a new ingress controller deployment is created to allow external traffic to reach the services that expose Ingress or Route resources. Updating this resource may lead to disruption for public facing network connections as a new ingress controller revision may be rolled out.\n\nhttps://kubernetes.io/docs/concepts/services-networking/ingress-controllers\n\nWhenever possible, sensible defaults for the platform are used. See each field for more details.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "metadata", - "spec" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -47016,175 +51156,152 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec is the specification of the desired behavior of the Insights.", + "description": "spec is the specification of the desired behavior of the IngressController.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.InsightsOperatorSpec" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerSpec" }, "status": { - "description": "status is the most recently observed status of the Insights operator.", + "description": "status is the most recently observed status of the IngressController.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.InsightsOperatorStatus" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "InsightsOperator", - "Scope": "Clustered" + "Kind": "IngressController", + "Scope": "Namespaced" } }, - "io.openshift.operator.v1.InsightsOperatorList": { - "description": "InsightsOperatorList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IngressControllerCaptureHTTPCookie": { + "description": "IngressControllerCaptureHTTPCookie describes an HTTP cookie that should be captured.", "type": "object", "required": [ - "metadata", - "items" + "maxLength" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "matchType": { + "description": "matchType specifies the type of match to be performed on the cookie name. Allowed values are \"Exact\" for an exact string match and \"Prefix\" for a string prefix match. If \"Exact\" is specified, a name must be specified in the name field. If \"Prefix\" is provided, a prefix must be specified in the namePrefix field. For example, specifying matchType \"Prefix\" and namePrefix \"foo\" will capture a cookie named \"foo\" or \"foobar\" but not one named \"bar\". The first matching cookie is captured.", "type": "string" }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.InsightsOperator" - } + "maxLength": { + "description": "maxLength specifies a maximum length of the string that will be logged, which includes the cookie name, cookie value, and one-character delimiter. If the log entry exceeds this length, the value will be truncated in the log message. Note that the ingress controller may impose a separate bound on the total length of HTTP headers in a request.", + "type": "integer", + "format": "int32", + "default": 0 }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "name": { + "description": "name specifies a cookie name. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", + "type": "string", + "default": "" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "namePrefix": { + "description": "namePrefix specifies a cookie name prefix. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "InsightsOperatorList", + "Kind": "IngressControllerCaptureHTTPCookie", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "matchType", + "fields-to-discriminateBy": { + "name": "Name", + "namePrefix": "NamePrefix" + } + } + ] }, - "io.openshift.operator.v1.InsightsOperatorSpec": { + "io.openshift.operator.v1.IngressControllerCaptureHTTPCookieUnion": { + "description": "IngressControllerCaptureHTTPCookieUnion describes optional fields of an HTTP cookie that should be captured.", "type": "object", - "required": [ - "managementState" - ], "properties": { - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "matchType": { + "description": "matchType specifies the type of match to be performed on the cookie name. Allowed values are \"Exact\" for an exact string match and \"Prefix\" for a string prefix match. If \"Exact\" is specified, a name must be specified in the name field. If \"Prefix\" is provided, a prefix must be specified in the namePrefix field. For example, specifying matchType \"Prefix\" and namePrefix \"foo\" will capture a cookie named \"foo\" or \"foobar\" but not one named \"bar\". The first matching cookie is captured.", "type": "string" }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", + "name": { + "description": "name specifies a cookie name. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", "type": "string", "default": "" }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "namePrefix": { + "description": "namePrefix specifies a cookie name prefix. Its value must be a valid HTTP cookie name as defined in RFC 6265 section 4.1.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "InsightsOperatorSpec", + "Kind": "IngressControllerCaptureHTTPCookieUnion", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "matchType", + "fields-to-discriminateBy": { + "name": "Name", + "namePrefix": "NamePrefix" + } + } + ] }, - "io.openshift.operator.v1.InsightsOperatorStatus": { + "io.openshift.operator.v1.IngressControllerCaptureHTTPHeader": { + "description": "IngressControllerCaptureHTTPHeader describes an HTTP header that should be captured.", "type": "object", "required": [ - "readyReplicas" + "name", + "maxLength" ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "gatherStatus": { - "description": "gatherStatus provides basic information about the last Insights data gathering. When omitted, this means no data gathering has taken place yet.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GatherStatus" - }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" - }, - "insightsReport": { - "description": "insightsReport provides general Insights analysis results. When omitted, this means no data gathering has taken place yet.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.InsightsReport" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "maxLength": { + "description": "maxLength specifies a maximum length for the header value. If a header value exceeds this length, the value will be truncated in the log message. Note that the ingress controller may impose a separate bound on the total length of HTTP headers in a request.", "type": "integer", "format": "int32", "default": 0 }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" + "name": { + "description": "name specifies a header name. Its value must be a valid HTTP header name as defined in RFC 2616 section 4.2.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "InsightsOperatorStatus", + "Kind": "IngressControllerCaptureHTTPHeader", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.InsightsReport": { - "description": "insightsReport provides Insights health check report based on the most recently sent Insights data.", + "io.openshift.operator.v1.IngressControllerCaptureHTTPHeaders": { + "description": "IngressControllerCaptureHTTPHeaders specifies which HTTP headers the IngressController captures.", "type": "object", "properties": { - "downloadedAt": { - "description": "downloadedAt is the time when the last Insights report was downloaded. An empty value means that there has not been any Insights report downloaded yet and it usually appears in disconnected clusters (or clusters when the Insights data gathering is disabled).", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "request": { + "description": "request specifies which HTTP request headers to capture.\n\nIf this field is empty, no request headers are captured.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerCaptureHTTPHeader" + }, + "x-kubernetes-list-type": "atomic" }, - "healthChecks": { - "description": "healthChecks provides basic information about active Insights health checks in a cluster.", + "response": { + "description": "response specifies which HTTP response headers to capture.\n\nIf this field is empty, no response headers are captured.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.HealthCheck" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerCaptureHTTPHeader" }, "x-kubernetes-list-type": "atomic" } @@ -47193,267 +51310,168 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "InsightsReport", + "Kind": "IngressControllerCaptureHTTPHeaders", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeAPIServer": { - "description": "KubeAPIServer provides information to configure an operator to manage kube-apiserver.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IngressControllerHTTPHeader": { + "description": "IngressControllerHTTPHeader specifies configuration for setting or deleting an HTTP header.", "type": "object", "required": [ - "metadata", - "spec" + "name", + "action" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec is the specification of the desired behavior of the Kubernetes API Server", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeAPIServerSpec" - }, - "status": { - "description": "status is the most recently observed status of the Kubernetes API Server", + "action": { + "description": "action specifies actions to perform on headers, such as setting or deleting headers.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeAPIServerStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "KubeAPIServer", - "Scope": "Clustered" - } - }, - "io.openshift.operator.v1.KubeAPIServerList": { - "description": "KubeAPIServerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "description": "Items contains the items", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeAPIServer" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeaderActionUnion" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "name": { + "description": "name specifies the name of a header on which to perform an action. Its value must be a valid HTTP header name as defined in RFC 2616 section 4.2. The name must consist only of alphanumeric and the following special characters, \"-!#$%\u0026'*+.^_`\". The following header names are reserved and may not be modified via this API: Strict-Transport-Security, Proxy, Host, Cookie, Set-Cookie. It must be no more than 255 characters in length. Header name must be unique.", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeAPIServerList", + "Kind": "IngressControllerHTTPHeader", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeAPIServerSpec": { + "io.openshift.operator.v1.IngressControllerHTTPHeaderActionUnion": { + "description": "IngressControllerHTTPHeaderActionUnion specifies an action to take on an HTTP header.", "type": "object", "required": [ - "managementState", - "forceRedeploymentReason" + "type" ], "properties": { - "failedRevisionLimit": { - "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", - "type": "integer", - "format": "int32" - }, - "forceRedeploymentReason": { - "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", - "type": "string", - "default": "" - }, - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" + "set": { + "description": "set specifies how the HTTP header should be set. This field is required when type is Set and forbidden otherwise.", + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerSetHTTPHeader" }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", + "type": { + "description": "type defines the type of the action to be applied on the header. Possible values are Set or Delete. Set allows you to set HTTP request and response headers. Delete allows you to delete HTTP request and response headers.", "type": "string", "default": "" - }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "succeededRevisionLimit": { - "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", - "type": "integer", - "format": "int32" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeAPIServerSpec", + "Kind": "IngressControllerHTTPHeaderActionUnion", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "set": "Set" + } + } + ] }, - "io.openshift.operator.v1.KubeAPIServerStatus": { + "io.openshift.operator.v1.IngressControllerHTTPHeaderActions": { + "description": "IngressControllerHTTPHeaderActions defines configuration for actions on HTTP request and response headers.", "type": "object", - "required": [ - "readyReplicas" - ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", + "request": { + "description": "request is a list of HTTP request headers to modify. Actions defined here will modify the request headers of all requests passing through an ingress controller. These actions are applied to all Routes i.e. for all connections handled by the ingress controller defined within a cluster. IngressController actions for request headers will be executed before Route actions. Currently, actions may define to either `Set` or `Delete` headers values. Actions are applied in sequence as defined in this list. A maximum of 20 request header actions may be configured. Sample fetchers allowed are \"req.hdr\" and \"ssl_c_der\". Converters allowed are \"lower\" and \"base64\". Example header values: \"%[req.hdr(X-target),lower]\", \"%{+Q}[ssl_c_der,base64]\".", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeader" }, "x-kubernetes-list-map-keys": [ - "type" + "name" ], "x-kubernetes-list-type": "map" }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" - }, - "latestAvailableRevision": { - "description": "latestAvailableRevision is the deploymentID of the most recent deployment", - "type": "integer", - "format": "int32" - }, - "latestAvailableRevisionReason": { - "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", - "type": "string" - }, - "nodeStatuses": { - "description": "nodeStatuses track the deployment values and errors across individual nodes", + "response": { + "description": "response is a list of HTTP response headers to modify. Actions defined here will modify the response headers of all requests passing through an ingress controller. These actions are applied to all Routes i.e. for all connections handled by the ingress controller defined within a cluster. IngressController actions for response headers will be executed after Route actions. Currently, actions may define to either `Set` or `Delete` headers values. Actions are applied in sequence as defined in this list. A maximum of 20 response header actions may be configured. Sample fetchers allowed are \"res.hdr\" and \"ssl_c_der\". Converters allowed are \"lower\" and \"base64\". Example header values: \"%[res.hdr(X-target),lower]\", \"%{+Q}[ssl_c_der,base64]\".", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeader" }, "x-kubernetes-list-map-keys": [ - "nodeName" + "name" ], "x-kubernetes-list-type": "map" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "IngressControllerHTTPHeaderActions", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.IngressControllerHTTPHeaders": { + "description": "IngressControllerHTTPHeaders specifies how the IngressController handles certain HTTP headers.", + "type": "object", + "properties": { + "actions": { + "description": "actions specifies options for modifying headers and their values. Note that this option only applies to cleartext HTTP connections and to secure HTTP connections for which the ingress controller terminates encryption (that is, edge-terminated or reencrypt connections). Headers cannot be modified for TLS passthrough connections. Setting the HSTS (`Strict-Transport-Security`) header is not supported via actions. `Strict-Transport-Security` may only be configured using the \"haproxy.router.openshift.io/hsts_header\" route annotation, and only in accordance with the policy specified in Ingress.Spec.RequiredHSTSPolicies. Any actions defined here are applied after any actions related to the following other fields: cache-control, spec.clientTLS, spec.httpHeaders.forwardedHeaderPolicy, spec.httpHeaders.uniqueId, and spec.httpHeaders.headerNameCaseAdjustments. In case of HTTP request headers, the actions specified in spec.httpHeaders.actions on the Route will be executed after the actions specified in the IngressController's spec.httpHeaders.actions field. In case of HTTP response headers, the actions specified in spec.httpHeaders.actions on the IngressController will be executed after the actions specified in the Route's spec.httpHeaders.actions field. Headers set using this API cannot be captured for use in access logs. The following header names are reserved and may not be modified via this API: Strict-Transport-Security, Proxy, Host, Cookie, Set-Cookie. Note that the total size of all net added headers *after* interpolating dynamic values must not exceed the value of spec.tuningOptions.headerBufferMaxRewriteBytes on the IngressController. Please refer to the documentation for that API field for more details.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeaderActions" }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 + "forwardedHeaderPolicy": { + "description": "forwardedHeaderPolicy specifies when and how the IngressController sets the Forwarded, X-Forwarded-For, X-Forwarded-Host, X-Forwarded-Port, X-Forwarded-Proto, and X-Forwarded-Proto-Version HTTP headers. The value may be one of the following:\n\n* \"Append\", which specifies that the IngressController appends the\n headers, preserving existing headers.\n\n* \"Replace\", which specifies that the IngressController sets the\n headers, replacing any existing Forwarded or X-Forwarded-* headers.\n\n* \"IfNone\", which specifies that the IngressController sets the\n headers if they are not already set.\n\n* \"Never\", which specifies that the IngressController never sets the\n headers, preserving any existing headers.\n\nBy default, the policy is \"Append\".", + "type": "string" }, - "serviceAccountIssuers": { - "description": "serviceAccountIssuers tracks history of used service account issuers. The item without expiration time represents the currently used service account issuer. The other items represents service account issuers that were used previously and are still being trusted. The default expiration for the items is set by the platform and it defaults to 24h. see: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#service-account-token-volume-projection", + "headerNameCaseAdjustments": { + "description": "headerNameCaseAdjustments specifies case adjustments that can be applied to HTTP header names. Each adjustment is specified as an HTTP header name with the desired capitalization. For example, specifying \"X-Forwarded-For\" indicates that the \"x-forwarded-for\" HTTP header should be adjusted to have the specified capitalization.\n\nThese adjustments are only applied to cleartext, edge-terminated, and re-encrypt routes, and only when using HTTP/1.\n\nFor request headers, these adjustments are applied only for routes that have the haproxy.router.openshift.io/h1-adjust-case=true annotation. For response headers, these adjustments are applied to all HTTP responses.\n\nIf this field is empty, no request headers are adjusted.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceAccountIssuerStatus" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" + "uniqueId": { + "description": "uniqueId describes configuration for a custom HTTP header that the ingress controller should inject into incoming HTTP requests. Typically, this header is configured to have a value that is unique to the HTTP request. The header can be used by applications or included in access logs to facilitate tracing individual HTTP requests.\n\nIf this field is empty, no such header is injected into requests.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPUniqueIdHeaderPolicy" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeAPIServerStatus", + "Kind": "IngressControllerHTTPHeaders", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeControllerManager": { - "description": "KubeControllerManager provides information to configure an operator to manage kube-controller-manager.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IngressControllerHTTPUniqueIdHeaderPolicy": { + "description": "IngressControllerHTTPUniqueIdHeaderPolicy describes configuration for a unique id header.", "type": "object", - "required": [ - "metadata", - "spec" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "format": { + "description": "format specifies the format for the injected HTTP header's value. This field has no effect unless name is specified. For the HAProxy-based ingress controller implementation, this format uses the same syntax as the HTTP log format. If the field is empty, the default value is \"%{+X}o\\ %ci:%cp_%fi:%fp_%Ts_%rt:%pid\"; see the corresponding HAProxy documentation: http://cbonte.github.io/haproxy-dconv/2.0/configuration.html#8.2.3", "type": "string" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "name": { + "description": "name specifies the name of the HTTP header (for example, \"unique-id\") that the ingress controller should inject into HTTP requests. The field's value must be a valid HTTP header name as defined in RFC 2616 section 4.2. If the field is empty, no header is injected.", "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec is the specification of the desired behavior of the Kubernetes Controller Manager", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeControllerManagerSpec" - }, - "status": { - "description": "status is the most recently observed status of the Kubernetes Controller Manager", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeControllerManagerStatus" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeControllerManager", - "Scope": "Clustered" + "Kind": "IngressControllerHTTPUniqueIdHeaderPolicy", + "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeControllerManagerList": { - "description": "KubeControllerManagerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IngressControllerList": { + "description": "IngressControllerList contains a list of IngressControllers.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "items" ], "properties": { @@ -47462,11 +51480,10 @@ "type": "string" }, "items": { - "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeControllerManager" + "$ref": "#/definitions/io.openshift.operator.v1.IngressController" } }, "kind": { @@ -47483,348 +51500,273 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeControllerManagerList", + "Kind": "IngressControllerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeControllerManagerSpec": { + "io.openshift.operator.v1.IngressControllerLogging": { + "description": "IngressControllerLogging describes what should be logged where.", "type": "object", - "required": [ - "managementState", - "forceRedeploymentReason", - "useMoreSecureServiceCA" - ], "properties": { - "failedRevisionLimit": { - "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", - "type": "integer", - "format": "int32" - }, - "forceRedeploymentReason": { - "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", - "type": "string", - "default": "" - }, - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", - "type": "string", - "default": "" - }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "succeededRevisionLimit": { - "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", - "type": "integer", - "format": "int32" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "useMoreSecureServiceCA": { - "description": "useMoreSecureServiceCA indicates that the service-ca.crt provided in SA token volumes should include only enough certificates to validate service serving certificates. Once set to true, it cannot be set to false. Even if someone finds a way to set it back to false, the service-ca.crt files that previously existed will only have the more secure content.", - "type": "boolean", - "default": false + "access": { + "description": "access describes how the client requests should be logged.\n\nIf this field is empty, access logging is disabled.", + "$ref": "#/definitions/io.openshift.operator.v1.AccessLogging" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeControllerManagerSpec", + "Kind": "IngressControllerLogging", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeControllerManagerStatus": { + "io.openshift.operator.v1.IngressControllerSetHTTPHeader": { + "description": "IngressControllerSetHTTPHeader defines the value which needs to be set on an HTTP header.", "type": "object", "required": [ - "readyReplicas" + "value" ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" - }, - "latestAvailableRevision": { - "description": "latestAvailableRevision is the deploymentID of the most recent deployment", - "type": "integer", - "format": "int32" - }, - "latestAvailableRevisionReason": { - "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", - "type": "string" - }, - "nodeStatuses": { - "description": "nodeStatuses track the deployment values and errors across individual nodes", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" - }, - "x-kubernetes-list-map-keys": [ - "nodeName" - ], - "x-kubernetes-list-type": "map" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 - }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" + "value": { + "description": "value specifies a header value. Dynamic values can be added. The value will be interpreted as an HAProxy format string as defined in http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#8.2.6 and may use HAProxy's %[] syntax and otherwise must be a valid HTTP header value as defined in https://datatracker.ietf.org/doc/html/rfc7230#section-3.2. The value of this field must be no more than 16384 characters in length. Note that the total size of all net added headers *after* interpolating dynamic values must not exceed the value of spec.tuningOptions.headerBufferMaxRewriteBytes on the IngressController.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeControllerManagerStatus", + "Kind": "IngressControllerSetHTTPHeader", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeScheduler": { - "description": "KubeScheduler provides information to configure an operator to manage scheduler.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.IngressControllerSpec": { + "description": "IngressControllerSpec is the specification of the desired behavior of the IngressController.", "type": "object", - "required": [ - "metadata", - "spec" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "clientTLS": { + "description": "clientTLS specifies settings for requesting and verifying client certificates, which can be used to enable mutual TLS for edge-terminated and reencrypt routes.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ClientTLS" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "defaultCertificate": { + "description": "defaultCertificate is a reference to a secret containing the default certificate served by the ingress controller. When Routes don't specify their own certificate, defaultCertificate is used.\n\nThe secret must contain the following keys and data:\n\n tls.crt: certificate file contents\n tls.key: key file contents\n\nIf unset, a wildcard certificate is automatically generated and used. The certificate is valid for the ingress controller domain (and subdomains) and the generated certificate's CA will be automatically integrated with the cluster's trust store.\n\nIf a wildcard certificate is used and shared by multiple HTTP/2 enabled routes (which implies ALPN) then clients (i.e., notably browsers) are at liberty to reuse open connections. This means a client can reuse a connection to another route and that is likely to fail. This behaviour is generally known as connection coalescing.\n\nThe in-use certificate (whether generated or user-specified) will be automatically integrated with OpenShift's built-in OAuth server.", + "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference" + }, + "domain": { + "description": "domain is a DNS name serviced by the ingress controller and is used to configure multiple features:\n\n* For the LoadBalancerService endpoint publishing strategy, domain is\n used to configure DNS records. See endpointPublishingStrategy.\n\n* When using a generated default certificate, the certificate will be valid\n for domain and its subdomains. See defaultCertificate.\n\n* The value is published to individual Route statuses so that end-users\n know where to target external DNS records.\n\ndomain must be unique among all IngressControllers, and cannot be updated.\n\nIf empty, defaults to ingress.config.openshift.io/cluster .spec.domain.", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + "endpointPublishingStrategy": { + "description": "endpointPublishingStrategy is used to publish the ingress controller endpoints to other networks, enable load balancer integrations, etc.\n\nIf unset, the default is based on infrastructure.config.openshift.io/cluster .status.platform:\n\n AWS: LoadBalancerService (with External scope)\n Azure: LoadBalancerService (with External scope)\n GCP: LoadBalancerService (with External scope)\n IBMCloud: LoadBalancerService (with External scope)\n AlibabaCloud: LoadBalancerService (with External scope)\n Libvirt: HostNetwork\n\nAny other platform types (including None) default to HostNetwork.\n\nendpointPublishingStrategy cannot be updated.", + "$ref": "#/definitions/io.openshift.operator.v1.EndpointPublishingStrategy" }, - "spec": { - "description": "spec is the specification of the desired behavior of the Kubernetes Scheduler", + "httpCompression": { + "description": "httpCompression defines a policy for HTTP traffic compression. By default, there is no HTTP compression.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeSchedulerSpec" + "$ref": "#/definitions/io.openshift.operator.v1.HTTPCompressionPolicy" }, - "status": { - "description": "status is the most recently observed status of the Kubernetes Scheduler", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeSchedulerStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "KubeScheduler", - "Scope": "Clustered" - } - }, - "io.openshift.operator.v1.KubeSchedulerList": { - "description": "KubeSchedulerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "httpEmptyRequestsPolicy": { + "description": "httpEmptyRequestsPolicy describes how HTTP connections should be handled if the connection times out before a request is received. Allowed values for this field are \"Respond\" and \"Ignore\". If the field is set to \"Respond\", the ingress controller sends an HTTP 400 or 408 response, logs the connection (if access logging is enabled), and counts the connection in the appropriate metrics. If the field is set to \"Ignore\", the ingress controller closes the connection without sending a response, logging the connection, or incrementing metrics. The default value is \"Respond\".\n\nTypically, these connections come from load balancers' health probes or Web browsers' speculative connections (\"preconnect\") and can be safely ignored. However, these requests may also be caused by network errors, and so setting this field to \"Ignore\" may impede detection and diagnosis of problems. In addition, these requests may be caused by port scans, in which case logging empty requests may aid in detecting intrusion attempts.", "type": "string" }, - "items": { - "description": "Items contains the items", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeScheduler" - } + "httpErrorCodePages": { + "description": "httpErrorCodePages specifies a configmap with custom error pages. The administrator must create this configmap in the openshift-config namespace. This configmap should have keys in the format \"error-page-\u003cerror code\u003e.http\", where \u003cerror code\u003e is an HTTP error code. For example, \"error-page-503.http\" defines an error page for HTTP 503 responses. Currently only error pages for 503 and 404 responses can be customized. Each value in the configmap should be the full response, including HTTP headers. Eg- https://raw.githubusercontent.com/openshift/router/fadab45747a9b30cc3f0a4b41ad2871f95827a93/images/router/haproxy/conf/error-page-503.http If this field is empty, the ingress controller uses the default error pages.", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.ConfigMapNameReference" + }, + "httpHeaders": { + "description": "httpHeaders defines policy for HTTP headers.\n\nIf this field is empty, the default values are used.", + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerHTTPHeaders" + }, + "logging": { + "description": "logging defines parameters for what should be logged where. If this field is empty, operational logs are enabled but access logs are disabled.", + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerLogging" + }, + "namespaceSelector": { + "description": "namespaceSelector is used to filter the set of namespaces serviced by the ingress controller. This is useful for implementing shards.\n\nIf unset, the default is no filtering.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + }, + "nodePlacement": { + "description": "nodePlacement enables explicit control over the scheduling of the ingress controller.\n\nIf unset, defaults are used. See NodePlacement for more details.", + "$ref": "#/definitions/io.openshift.operator.v1.NodePlacement" + }, + "replicas": { + "description": "replicas is the desired number of ingress controller replicas. If unset, the default depends on the value of the defaultPlacement field in the cluster config.openshift.io/v1/ingresses status.\n\nThe value of replicas is set based on the value of a chosen field in the Infrastructure CR. If defaultPlacement is set to ControlPlane, the chosen field will be controlPlaneTopology. If it is set to Workers the chosen field will be infrastructureTopology. Replicas will then be set to 1 or 2 based whether the chosen field's value is SingleReplica or HighlyAvailable, respectively.\n\nThese defaults are subject to change.", + "type": "integer", + "format": "int32" + }, + "routeAdmission": { + "description": "routeAdmission defines a policy for handling new route claims (for example, to allow or deny claims across namespaces).\n\nIf empty, defaults will be applied. See specific routeAdmission fields for details about their defaults.", + "$ref": "#/definitions/io.openshift.operator.v1.RouteAdmissionPolicy" + }, + "routeSelector": { + "description": "routeSelector is used to filter the set of Routes serviced by the ingress controller. This is useful for implementing shards.\n\nIf unset, the default is no filtering.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "tlsSecurityProfile": { + "description": "tlsSecurityProfile specifies settings for TLS connections for ingresscontrollers.\n\nIf unset, the default is based on the apiservers.config.openshift.io/cluster resource.\n\nNote that when using the Old, Intermediate, and Modern profile types, the effective profile configuration is subject to change between releases. For example, given a specification to use the Intermediate profile deployed on release X.Y.Z, an upgrade to release X.Y.Z+1 may cause a new profile configuration to be applied to the ingress controller, resulting in a rollout.", + "$ref": "#/definitions/io.openshift.config.v1.TLSSecurityProfile" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "tuningOptions": { + "description": "tuningOptions defines parameters for adjusting the performance of ingress controller pods. All fields are optional and will use their respective defaults if not set. See specific tuningOptions fields for more details.\n\nSetting fields within tuningOptions is generally not recommended. The default values are suitable for most configurations.", "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "$ref": "#/definitions/io.openshift.operator.v1.IngressControllerTuningOptions" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides allows specifying unsupported configuration options. Its use is unsupported.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeSchedulerList", + "Kind": "IngressControllerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeSchedulerSpec": { + "io.openshift.operator.v1.IngressControllerStatus": { + "description": "IngressControllerStatus defines the observed status of the IngressController.", "type": "object", "required": [ - "managementState", - "forceRedeploymentReason" + "availableReplicas", + "selector", + "domain" ], "properties": { - "failedRevisionLimit": { - "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "availableReplicas": { + "description": "availableReplicas is number of observed available replicas according to the ingress controller deployment.", "type": "integer", - "format": "int32" - }, - "forceRedeploymentReason": { - "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", - "type": "string", - "default": "" + "format": "int32", + "default": 0 }, - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" + "conditions": { + "description": "conditions is a list of conditions and their status.\n\nAvailable means the ingress controller deployment is available and servicing route and ingress resources (i.e, .status.availableReplicas equals .spec.replicas)\n\nThere are additional conditions which indicate the status of other ingress controller features and capabilities.\n\n * LoadBalancerManaged\n - True if the following conditions are met:\n * The endpoint publishing strategy requires a service load balancer.\n - False if any of those conditions are unsatisfied.\n\n * LoadBalancerReady\n - True if the following conditions are met:\n * A load balancer is managed.\n * The load balancer is ready.\n - False if any of those conditions are unsatisfied.\n\n * DNSManaged\n - True if the following conditions are met:\n * The endpoint publishing strategy and platform support DNS.\n * The ingress controller domain is set.\n * dns.config.openshift.io/cluster configures DNS zones.\n - False if any of those conditions are unsatisfied.\n\n * DNSReady\n - True if the following conditions are met:\n * DNS is managed.\n * DNS records have been successfully created.\n - False if any of those conditions are unsatisfied.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", + "domain": { + "description": "domain is the actual domain in use.", "type": "string", "default": "" }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "endpointPublishingStrategy": { + "description": "endpointPublishingStrategy is the actual strategy in use.", + "$ref": "#/definitions/io.openshift.operator.v1.EndpointPublishingStrategy" }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" + "namespaceSelector": { + "description": "namespaceSelector is the actual namespaceSelector in use.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "succeededRevisionLimit": { - "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "observedGeneration": { + "description": "observedGeneration is the most recent generation observed.", "type": "integer", - "format": "int32" + "format": "int64" }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "routeSelector": { + "description": "routeSelector is the actual routeSelector in use.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + }, + "selector": { + "description": "selector is a label selector, in string format, for ingress controller pods corresponding to the IngressController. The number of matching pods should equal the value of availableReplicas.", + "type": "string", + "default": "" + }, + "tlsProfile": { + "description": "tlsProfile is the TLS connection configuration that is in effect.", + "$ref": "#/definitions/io.openshift.config.v1.TLSProfileSpec" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeSchedulerSpec", + "Kind": "IngressControllerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeSchedulerStatus": { + "io.openshift.operator.v1.IngressControllerTuningOptions": { + "description": "IngressControllerTuningOptions specifies options for tuning the performance of ingress controller pods", "type": "object", - "required": [ - "readyReplicas" - ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" + "clientFinTimeout": { + "description": "clientFinTimeout defines how long a connection will be held open while waiting for the client response to the server/backend closing the connection.\n\nIf unset, the default timeout is 1s", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" + "clientTimeout": { + "description": "clientTimeout defines how long a connection will be held open while waiting for a client response.\n\nIf unset, the default timeout is 30s", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "latestAvailableRevision": { - "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "connectTimeout": { + "description": "ConnectTimeout defines the maximum time to wait for a connection attempt to a server/backend to succeed.\n\nThis field expects an unsigned duration string of decimal numbers, each with optional fraction and a unit suffix, e.g. \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".\n\nWhen omitted, this means the user has no opinion and the platform is left to choose a reasonable default. This default is subject to change over time. The current default is 5s.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "headerBufferBytes": { + "description": "headerBufferBytes describes how much memory should be reserved (in bytes) for IngressController connection sessions. Note that this value must be at least 16384 if HTTP/2 is enabled for the IngressController (https://tools.ietf.org/html/rfc7540). If this field is empty, the IngressController will use a default value of 32768 bytes.\n\nSetting this field is generally not recommended as headerBufferBytes values that are too small may break the IngressController and headerBufferBytes values that are too large could cause the IngressController to use significantly more memory than necessary.", "type": "integer", "format": "int32" }, - "latestAvailableRevisionReason": { - "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", - "type": "string" + "headerBufferMaxRewriteBytes": { + "description": "headerBufferMaxRewriteBytes describes how much memory should be reserved (in bytes) from headerBufferBytes for HTTP header rewriting and appending for IngressController connection sessions. Note that incoming HTTP requests will be limited to (headerBufferBytes - headerBufferMaxRewriteBytes) bytes, meaning headerBufferBytes must be greater than headerBufferMaxRewriteBytes. If this field is empty, the IngressController will use a default value of 8192 bytes.\n\nSetting this field is generally not recommended as headerBufferMaxRewriteBytes values that are too small may break the IngressController and headerBufferMaxRewriteBytes values that are too large could cause the IngressController to use significantly more memory than necessary.", + "type": "integer", + "format": "int32" }, - "nodeStatuses": { - "description": "nodeStatuses track the deployment values and errors across individual nodes", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" - }, - "x-kubernetes-list-map-keys": [ - "nodeName" - ], - "x-kubernetes-list-type": "map" + "healthCheckInterval": { + "description": "healthCheckInterval defines how long the router waits between two consecutive health checks on its configured backends. This value is applied globally as a default for all routes, but may be overridden per-route by the route annotation \"router.openshift.io/haproxy.health.check.interval\".\n\nExpects an unsigned duration string of decimal numbers, each with optional fraction and a unit suffix, eg \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".\n\nSetting this to less than 5s can cause excess traffic due to too frequent TCP health checks and accompanying SYN packet storms. Alternatively, setting this too high can result in increased latency, due to backend servers that are no longer available, but haven't yet been detected as such.\n\nAn empty or zero healthCheckInterval means no opinion and IngressController chooses a default, which is subject to change over time. Currently the default healthCheckInterval value is 5s.\n\nCurrently the minimum allowed value is 1s and the maximum allowed value is 2147483647ms (24.85 days). Both are subject to change over time.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", + "maxConnections": { + "description": "maxConnections defines the maximum number of simultaneous connections that can be established per HAProxy process. Increasing this value allows each ingress controller pod to handle more connections but at the cost of additional system resources being consumed.\n\nPermitted values are: empty, 0, -1, and the range 2000-2000000.\n\nIf this field is empty or 0, the IngressController will use the default value of 50000, but the default is subject to change in future releases.\n\nIf the value is -1 then HAProxy will dynamically compute a maximum value based on the available ulimits in the running container. Selecting -1 (i.e., auto) will result in a large value being computed (~520000 on OpenShift \u003e=4.10 clusters) and therefore each HAProxy process will incur significant memory usage compared to the current default of 50000.\n\nSetting a value that is greater than the current operating system limit will prevent the HAProxy process from starting.\n\nIf you choose a discrete value (e.g., 750000) and the router pod is migrated to a new node, there's no guarantee that that new node has identical ulimits configured. In such a scenario the pod would fail to start. If you have nodes with different ulimits configured (e.g., different tuned profiles) and you choose a discrete value then the guidance is to use -1 and let the value be computed dynamically at runtime.\n\nYou can monitor memory usage for router containers with the following metric: 'container_memory_working_set_bytes{container=\"router\",namespace=\"openshift-ingress\"}'.\n\nYou can monitor memory usage of individual HAProxy processes in router containers with the following metric: 'container_memory_working_set_bytes{container=\"router\",namespace=\"openshift-ingress\"}/container_processes{container=\"router\",namespace=\"openshift-ingress\"}'.", "type": "integer", - "format": "int64" + "format": "int32" }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "reloadInterval": { + "description": "reloadInterval defines the minimum interval at which the router is allowed to reload to accept new changes. Increasing this value can prevent the accumulation of HAProxy processes, depending on the scenario. Increasing this interval can also lessen load imbalance on a backend's servers when using the roundrobin balancing algorithm. Alternatively, decreasing this value may decrease latency since updates to HAProxy's configuration can take effect more quickly.\n\nThe value must be a time duration value; see \u003chttps://pkg.go.dev/time#ParseDuration\u003e. Currently, the minimum value allowed is 1s, and the maximum allowed value is 120s. Minimum and maximum allowed values may change in future versions of OpenShift. Note that if a duration outside of these bounds is provided, the value of reloadInterval will be capped/floored and not rejected (e.g. a duration of over 120s will be capped to 120s; the IngressController will not reject and replace this disallowed value with the default).\n\nA zero value for reloadInterval tells the IngressController to choose the default, which is currently 5s and subject to change without notice.\n\nThis field expects an unsigned duration string of decimal numbers, each with optional fraction and a unit suffix, e.g. \"300ms\", \"1.5h\" or \"2h45m\". Valid time units are \"ns\", \"us\" (or \"µs\" U+00B5 or \"μs\" U+03BC), \"ms\", \"s\", \"m\", \"h\".\n\nNote: Setting a value significantly larger than the default of 5s can cause latency in observing updates to routes and their endpoints. HAProxy's configuration will be reloaded less frequently, and newly created routes will not be served until the subsequent reload.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "serverFinTimeout": { + "description": "serverFinTimeout defines how long a connection will be held open while waiting for the server/backend response to the client closing the connection.\n\nIf unset, the default timeout is 1s", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "serverTimeout": { + "description": "serverTimeout defines how long a connection will be held open while waiting for a server/backend response.\n\nIf unset, the default timeout is 30s", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "threadCount": { + "description": "threadCount defines the number of threads created per HAProxy process. Creating more threads allows each ingress controller pod to handle more connections, at the cost of more system resources being used. HAProxy currently supports up to 64 threads. If this field is empty, the IngressController will use the default value. The current default is 4 threads, but this may change in future releases.\n\nSetting this field is generally not recommended. Increasing the number of HAProxy threads allows ingress controller pods to utilize more CPU time under load, potentially starving other pods if set too high. Reducing the number of threads may cause the ingress controller to perform poorly.", "type": "integer", - "format": "int32", - "default": 0 + "format": "int32" }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" + "tlsInspectDelay": { + "description": "tlsInspectDelay defines how long the router can hold data to find a matching route.\n\nSetting this too short can cause the router to fall back to the default certificate for edge-terminated or reencrypt routes even when a better matching certificate could be used.\n\nIf unset, the default inspect delay is 5s", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + }, + "tunnelTimeout": { + "description": "tunnelTimeout defines how long a tunnel connection (including websockets) will be held open while the tunnel is idle.\n\nIf unset, the default timeout is 1h", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeSchedulerStatus", + "Kind": "IngressControllerTuningOptions", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeStorageVersionMigrator": { - "description": "KubeStorageVersionMigrator provides information to configure an operator to manage kube-storage-version-migrator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.InsightsOperator": { + "description": "InsightsOperator holds cluster-wide information about the Insights Operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -47845,24 +51787,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec is the specification of the desired behavior of the Insights.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeStorageVersionMigratorSpec" + "$ref": "#/definitions/io.openshift.operator.v1.InsightsOperatorSpec" }, "status": { + "description": "status is the most recently observed status of the Insights operator.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeStorageVersionMigratorStatus" + "$ref": "#/definitions/io.openshift.operator.v1.InsightsOperatorStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeStorageVersionMigrator", + "Kind": "InsightsOperator", "Scope": "Clustered" } }, - "io.openshift.operator.v1.KubeStorageVersionMigratorList": { - "description": "KubeStorageVersionMigratorList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.InsightsOperatorList": { + "description": "InsightsOperatorList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -47874,11 +51818,10 @@ "type": "string" }, "items": { - "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.KubeStorageVersionMigrator" + "$ref": "#/definitions/io.openshift.operator.v1.InsightsOperator" } }, "kind": { @@ -47895,11 +51838,11 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeStorageVersionMigratorList", + "Kind": "InsightsOperatorList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeStorageVersionMigratorSpec": { + "io.openshift.operator.v1.InsightsOperatorSpec": { "type": "object", "required": [ "managementState" @@ -47933,11 +51876,11 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeStorageVersionMigratorSpec", + "Kind": "InsightsOperatorSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.KubeStorageVersionMigratorStatus": { + "io.openshift.operator.v1.InsightsOperatorStatus": { "type": "object", "required": [ "readyReplicas" @@ -47955,6 +51898,11 @@ ], "x-kubernetes-list-type": "map" }, + "gatherStatus": { + "description": "gatherStatus provides basic information about the last Insights data gathering. When omitted, this means no data gathering has taken place yet.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.GatherStatus" + }, "generations": { "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", @@ -47962,7 +51910,23 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "insightsReport": { + "description": "insightsReport provides general Insights analysis results. When omitted, this means no data gathering has taken place yet.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.InsightsReport" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -47984,136 +51948,39 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "KubeStorageVersionMigratorStatus", + "Kind": "InsightsOperatorStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.LoadBalancerStrategy": { - "description": "LoadBalancerStrategy holds parameters for a load balancer.", + "io.openshift.operator.v1.InsightsReport": { + "description": "insightsReport provides Insights health check report based on the most recently sent Insights data.", "type": "object", - "required": [ - "scope" - ], "properties": { - "allowedSourceRanges": { - "description": "allowedSourceRanges specifies an allowlist of IP address ranges to which access to the load balancer should be restricted. Each range must be specified using CIDR notation (e.g. \"10.0.0.0/8\" or \"fd00::/8\"). If no range is specified, \"0.0.0.0/0\" for IPv4 and \"::/0\" for IPv6 are used by default, which allows all source addresses.\n\nTo facilitate migration from earlier versions of OpenShift that did not have the allowedSourceRanges field, you may set the service.beta.kubernetes.io/load-balancer-source-ranges annotation on the \"router-\u003cingresscontroller name\u003e\" service in the \"openshift-ingress\" namespace, and this annotation will take effect if allowedSourceRanges is empty on OpenShift 4.12.", + "downloadedAt": { + "description": "downloadedAt is the time when the last Insights report was downloaded. An empty value means that there has not been any Insights report downloaded yet and it usually appears in disconnected clusters (or clusters when the Insights data gathering is disabled).", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + }, + "healthChecks": { + "description": "healthChecks provides basic information about active Insights health checks in a cluster.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.HealthCheck" }, "x-kubernetes-list-type": "atomic" - }, - "dnsManagementPolicy": { - "description": "dnsManagementPolicy indicates if the lifecycle of the wildcard DNS record associated with the load balancer service will be managed by the ingress operator. It defaults to Managed. Valid values are: Managed and Unmanaged.", - "type": "string", - "default": "Managed" - }, - "providerParameters": { - "description": "providerParameters holds desired load balancer information specific to the underlying infrastructure provider.\n\nIf empty, defaults will be applied. See specific providerParameters fields for details about their defaults.", - "$ref": "#/definitions/io.openshift.operator.v1.ProviderLoadBalancerParameters" - }, - "scope": { - "description": "scope indicates the scope at which the load balancer is exposed. Possible values are \"External\" and \"Internal\".", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "LoadBalancerStrategy", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.LoggingDestination": { - "description": "LoggingDestination describes a destination for log messages.", - "type": "object", - "required": [ - "type" - ], - "properties": { - "container": { - "description": "container holds parameters for the Container logging destination. Present only if type is Container.", - "$ref": "#/definitions/io.openshift.operator.v1.ContainerLoggingDestinationParameters" - }, - "syslog": { - "description": "syslog holds parameters for a syslog endpoint. Present only if type is Syslog.", - "$ref": "#/definitions/io.openshift.operator.v1.SyslogLoggingDestinationParameters" - }, - "type": { - "description": "type is the type of destination for logs. It must be one of the following:\n\n* Container\n\nThe ingress operator configures the sidecar container named \"logs\" on the ingress controller pod and configures the ingress controller to write logs to the sidecar. The logs are then available as container logs. The expectation is that the administrator configures a custom logging solution that reads logs from this sidecar. Note that using container logs means that logs may be dropped if the rate of logs exceeds the container runtime's or the custom logging solution's capacity.\n\n* Syslog\n\nLogs are sent to a syslog endpoint. The administrator must specify an endpoint that can receive syslog messages. The expectation is that the administrator has configured a custom syslog instance.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "LoggingDestination", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "container": "Container", - "syslog": "Syslog" - } - } - ] - }, - "io.openshift.operator.v1.MTUMigration": { - "description": "MTUMigration contains infomation about MTU migration.", - "type": "object", - "properties": { - "machine": { - "description": "machine contains MTU migration configuration for the machine's uplink. Needs to be migrated along with the default network MTU unless the current uplink MTU already accommodates the default network MTU.", - "$ref": "#/definitions/io.openshift.operator.v1.MTUMigrationValues" - }, - "network": { - "description": "network contains information about MTU migration for the default network. Migrations are only allowed to MTU values lower than the machine's uplink MTU by the minimum appropriate offset.", - "$ref": "#/definitions/io.openshift.operator.v1.MTUMigrationValues" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "MTUMigration", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.MTUMigrationValues": { - "description": "MTUMigrationValues contains the values for a MTU migration.", - "type": "object", - "required": [ - "to" - ], - "properties": { - "from": { - "description": "from is the MTU to migrate from.", - "type": "integer", - "format": "int64" - }, - "to": { - "description": "to is the MTU to migrate to.", - "type": "integer", - "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MTUMigrationValues", + "Kind": "InsightsReport", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.MachineConfiguration": { - "description": "MachineConfiguration provides information to configure an operator to manage Machine Configuration.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.KubeAPIServer": { + "description": "KubeAPIServer provides information to configure an operator to manage kube-apiserver.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -48134,26 +52001,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec is the specification of the desired behavior of the Machine Config Operator", + "description": "spec is the specification of the desired behavior of the Kubernetes API Server", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MachineConfigurationSpec" + "$ref": "#/definitions/io.openshift.operator.v1.KubeAPIServerSpec" }, "status": { - "description": "status is the most recently observed status of the Machine Config Operator", + "description": "status is the most recently observed status of the Kubernetes API Server", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MachineConfigurationStatus" + "$ref": "#/definitions/io.openshift.operator.v1.KubeAPIServerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MachineConfiguration", + "Kind": "KubeAPIServer", "Scope": "Clustered" } }, - "io.openshift.operator.v1.MachineConfigurationList": { - "description": "MachineConfigurationList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.KubeAPIServerList": { + "description": "KubeAPIServerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -48169,7 +52036,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MachineConfiguration" + "$ref": "#/definitions/io.openshift.operator.v1.KubeAPIServer" } }, "kind": { @@ -48186,11 +52053,11 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MachineConfigurationList", + "Kind": "KubeAPIServerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.MachineConfigurationSpec": { + "io.openshift.operator.v1.KubeAPIServerSpec": { "type": "object", "required": [ "managementState", @@ -48211,21 +52078,11 @@ "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, - "managedBootImages": { - "description": "managedBootImages allows configuration for the management of boot images for machine resources within the cluster. This configuration allows users to select resources that should be updated to the latest boot images during cluster upgrades, ensuring that new machines always boot with the current cluster version's boot image. When omitted, no boot images will be updated.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ManagedBootImages" - }, "managementState": { "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" }, - "nodeDisruptionPolicy": { - "description": "nodeDisruptionPolicy allows an admin to set granular node disruption actions for MachineConfig-based updates, such as drains, service reloads, etc. Specifying this will allow for less downtime when doing small configuration updates to the cluster. This configuration has no effect on cluster upgrades which will still incur node disruption where required.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyConfig" - }, "observedConfig": { "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", "default": {}, @@ -48250,143 +52107,102 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MachineConfigurationSpec", + "Kind": "KubeAPIServerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.MachineConfigurationStatus": { + "io.openshift.operator.v1.KubeAPIServerStatus": { "type": "object", + "required": [ + "readyReplicas" + ], "properties": { "conditions": { "description": "conditions is a list of conditions and their status", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" }, "x-kubernetes-list-map-keys": [ "type" ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "nodeDisruptionPolicyStatus": { - "description": "nodeDisruptionPolicyStatus status reflects what the latest cluster-validated policies are, and will be used by the Machine Config Daemon during future node updates.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatus" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "MachineConfigurationStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.MachineManager": { - "description": "MachineManager describes a target machine resource that is registered for boot image updates. It stores identifying information such as the resource type and the API Group of the resource. It also provides granular control via the selection field.", - "type": "object", - "required": [ - "resource", - "apiGroup", - "selection" - ], - "properties": { - "apiGroup": { - "description": "apiGroup is name of the APIGroup that the machine management resource belongs to. The only current valid value is machine.openshift.io. machine.openshift.io means that the machine manager will only register resources that belong to OpenShift machine API group.", - "type": "string", - "default": "" - }, - "resource": { - "description": "resource is the machine management resource's type. The only current valid value is machinesets. machinesets means that the machine manager will only register resources of the kind MachineSet.", - "type": "string", - "default": "" - }, - "selection": { - "description": "selection allows granular control of the machine management resources that will be registered for boot image updates.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MachineManagerSelector" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "MachineManager", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.MachineManagerSelector": { - "type": "object", - "required": [ - "mode" - ], - "properties": { - "mode": { - "description": "mode determines how machine managers will be selected for updates. Valid values are All and Partial. All means that every resource matched by the machine manager will be updated. Partial requires specified selector(s) and allows customisation of which resources matched by the machine manager will be updated.", - "type": "string", - "default": "" + "x-kubernetes-list-type": "map" }, - "partial": { - "description": "partial provides label selector(s) that can be used to match machine management resources. Only permitted when mode is set to \"Partial\".", - "$ref": "#/definitions/io.openshift.operator.v1.PartialSelector" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "MachineManagerSelector", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "mode", - "fields-to-discriminateBy": { - "partial": "Partial" - } - } - ] - }, - "io.openshift.operator.v1.ManagedBootImages": { - "type": "object", - "properties": { - "machineManagers": { - "description": "machineManagers can be used to register machine management resources for boot image updates. The Machine Config Operator will watch for changes to this list. Only one entry is permitted per type of machine management resource.", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MachineManager" + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, "x-kubernetes-list-map-keys": [ + "group", "resource", - "apiGroup" + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "latestAvailableRevisionReason": { + "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", + "type": "string" + }, + "nodeStatuses": { + "description": "nodeStatuses track the deployment values and errors across individual nodes", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" + }, + "x-kubernetes-list-map-keys": [ + "nodeName" ], "x-kubernetes-list-type": "map" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 + }, + "serviceAccountIssuers": { + "description": "serviceAccountIssuers tracks history of used service account issuers. The item without expiration time represents the currently used service account issuer. The other items represents service account issuers that were used previously and are still being trusted. The default expiration for the items is set by the platform and it defaults to 24h. see: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#service-account-token-volume-projection", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ServiceAccountIssuerStatus" + } + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ManagedBootImages", + "Kind": "KubeAPIServerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.MyOperatorResource": { - "description": "MyOperatorResource is an example operator configuration type\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.KubeControllerManager": { + "description": "KubeControllerManager provides information to configure an operator to manage kube-controller-manager.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", - "spec", - "status" + "spec" ], "properties": { "apiVersion": { @@ -48403,28 +52219,80 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec is the specification of the desired behavior of the Kubernetes Controller Manager", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MyOperatorResourceSpec" + "$ref": "#/definitions/io.openshift.operator.v1.KubeControllerManagerSpec" }, "status": { + "description": "status is the most recently observed status of the Kubernetes Controller Manager", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.MyOperatorResourceStatus" + "$ref": "#/definitions/io.openshift.operator.v1.KubeControllerManagerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MyOperatorResource", + "Kind": "KubeControllerManager", + "Scope": "Clustered" + } + }, + "io.openshift.operator.v1.KubeControllerManagerList": { + "description": "KubeControllerManagerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "items": { + "description": "Items contains the items", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.KubeControllerManager" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + } + }, + "x-fabric8-info": { + "Type": "list", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "KubeControllerManagerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.MyOperatorResourceSpec": { + "io.openshift.operator.v1.KubeControllerManagerSpec": { "type": "object", "required": [ - "managementState" + "managementState", + "forceRedeploymentReason", + "useMoreSecureServiceCA" ], "properties": { + "failedRevisionLimit": { + "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "type": "integer", + "format": "int32" + }, + "forceRedeploymentReason": { + "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", + "type": "string", + "default": "" + }, "logLevel": { "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" @@ -48443,21 +52311,31 @@ "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, + "succeededRevisionLimit": { + "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "type": "integer", + "format": "int32" + }, "unsupportedConfigOverrides": { "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "useMoreSecureServiceCA": { + "description": "useMoreSecureServiceCA indicates that the service-ca.crt provided in SA token volumes should include only enough certificates to validate service serving certificates. Once set to true, it cannot be set to false. Even if someone finds a way to set it back to false, the service-ca.crt files that previously existed will only have the more secure content.", + "type": "boolean", + "default": false } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MyOperatorResourceSpec", + "Kind": "KubeControllerManagerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.MyOperatorResourceStatus": { + "io.openshift.operator.v1.KubeControllerManagerStatus": { "type": "object", "required": [ "readyReplicas" @@ -48482,7 +52360,34 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "latestAvailableRevisionReason": { + "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", + "type": "string" + }, + "nodeStatuses": { + "description": "nodeStatuses track the deployment values and errors across individual nodes", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" + }, + "x-kubernetes-list-map-keys": [ + "nodeName" + ], + "x-kubernetes-list-type": "map" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -48504,34 +52409,17 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "MyOperatorResourceStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.NetFlowConfig": { - "type": "object", - "properties": { - "collectors": { - "description": "netFlow defines the NetFlow collectors that will consume the flow data exported from OVS. It is a list of strings formatted as ip:port with a maximum of ten items", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "NetFlowConfig", + "Kind": "KubeControllerManagerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.Network": { - "description": "Network describes the cluster's desired network configuration. It is consumed by the cluster-network-operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.KubeScheduler": { + "description": "KubeScheduler provides information to configure an operator to manage scheduler.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "metadata", + "spec" + ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -48547,26 +52435,29 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec is the specification of the desired behavior of the Kubernetes Scheduler", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NetworkSpec" + "$ref": "#/definitions/io.openshift.operator.v1.KubeSchedulerSpec" }, "status": { + "description": "status is the most recently observed status of the Kubernetes Scheduler", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NetworkStatus" + "$ref": "#/definitions/io.openshift.operator.v1.KubeSchedulerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "Network", + "Kind": "KubeScheduler", "Scope": "Clustered" } }, - "io.openshift.operator.v1.NetworkList": { - "description": "NetworkList contains a list of Network configurations\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.KubeSchedulerList": { + "description": "KubeSchedulerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "items" ], "properties": { @@ -48575,10 +52466,11 @@ "type": "string" }, "items": { + "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.Network" + "$ref": "#/definitions/io.openshift.operator.v1.KubeScheduler" } }, "kind": { @@ -48595,99 +52487,26 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NetworkList", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.NetworkMigration": { - "description": "NetworkMigration represents the cluster network migration configuration.", - "type": "object", - "properties": { - "features": { - "description": "features was previously used to configure which network plugin features would be migrated in a network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", - "$ref": "#/definitions/io.openshift.operator.v1.FeaturesMigration" - }, - "mode": { - "description": "mode indicates the mode of network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", - "type": "string" - }, - "mtu": { - "description": "mtu contains the MTU migration configuration. Set this to allow changing the MTU values for the default network. If unset, the operation of changing the MTU for the default network will be rejected.", - "$ref": "#/definitions/io.openshift.operator.v1.MTUMigration" - }, - "networkType": { - "description": "networkType was previously used when changing the default network type. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "NetworkMigration", + "Kind": "KubeSchedulerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NetworkSpec": { - "description": "NetworkSpec is the top-level network configuration object.", + "io.openshift.operator.v1.KubeSchedulerSpec": { "type": "object", "required": [ "managementState", - "clusterNetwork", - "serviceNetwork", - "defaultNetwork" + "forceRedeploymentReason" ], "properties": { - "additionalNetworks": { - "description": "additionalNetworks is a list of extra networks to make available to pods when multiple networks are enabled.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.AdditionalNetworkDefinition" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" - }, - "additionalRoutingCapabilities": { - "description": "additionalRoutingCapabilities describes components and relevant configuration providing additional routing capabilities. When set, it enables such components and the usage of the routing capabilities they provide for the machine network. Upstream operators, like MetalLB operator, requiring these capabilities may rely on, or automatically set this attribute. Network plugins may leverage advanced routing capabilities acquired through the enablement of these components but may require specific configuration on their side to do so; refer to their respective documentation and configuration options.", - "$ref": "#/definitions/io.openshift.operator.v1.AdditionalRoutingCapabilities" - }, - "clusterNetwork": { - "description": "clusterNetwork is the IP address pool to use for pod IPs. Some network providers support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ClusterNetworkEntry" - }, - "x-kubernetes-list-type": "atomic" - }, - "defaultNetwork": { - "description": "defaultNetwork is the \"default\" network that all pods will receive", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.DefaultNetworkDefinition" - }, - "deployKubeProxy": { - "description": "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when ovn-kubernetes is used and true otherwise.", - "type": "boolean" - }, - "disableMultiNetwork": { - "description": "disableMultiNetwork specifies whether or not multiple pod network support should be disabled. If unset, this property defaults to 'false' and multiple network support is enabled.", - "type": "boolean" - }, - "disableNetworkDiagnostics": { - "description": "disableNetworkDiagnostics specifies whether or not PodNetworkConnectivityCheck CRs from a test pod to every node, apiserver and LB should be disabled or not. If unset, this property defaults to 'false' and network diagnostics is enabled. Setting this to 'true' would reduce the additional load of the pods performing the checks.", - "type": "boolean", - "default": false - }, - "exportNetworkFlows": { - "description": "exportNetworkFlows enables and configures the export of network flow metadata from the pod network by using protocols NetFlow, SFlow or IPFIX. Currently only supported on OVN-Kubernetes plugin. If unset, flows will not be exported to any collector.", - "$ref": "#/definitions/io.openshift.operator.v1.ExportNetworkFlows" + "failedRevisionLimit": { + "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "type": "integer", + "format": "int32" }, - "kubeProxyConfig": { - "description": "kubeProxyConfig lets us configure desired proxy configuration, if deployKubeProxy is true. If not specified, sensible defaults will be chosen by OpenShift directly.", - "$ref": "#/definitions/io.openshift.operator.v1.ProxyConfig" + "forceRedeploymentReason": { + "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", + "type": "string", + "default": "" }, "logLevel": { "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", @@ -48698,10 +52517,6 @@ "type": "string", "default": "" }, - "migration": { - "description": "migration enables and configures cluster network migration, for network changes that cannot be made instantly.", - "$ref": "#/definitions/io.openshift.operator.v1.NetworkMigration" - }, "observedConfig": { "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", "default": {}, @@ -48711,35 +52526,26 @@ "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, - "serviceNetwork": { - "description": "serviceNetwork is the ip address pool to use for Service IPs Currently, all existing network providers only support a single value here, but this is an array to allow for growth.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "succeededRevisionLimit": { + "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "type": "integer", + "format": "int32" }, "unsupportedConfigOverrides": { "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "useMultiNetworkPolicy": { - "description": "useMultiNetworkPolicy enables a controller which allows for MultiNetworkPolicy objects to be used on additional networks as created by Multus CNI. MultiNetworkPolicy are similar to NetworkPolicy objects, but NetworkPolicy objects only apply to the primary interface. With MultiNetworkPolicy, you can control the traffic that a pod can receive over the secondary interfaces. If unset, this property defaults to 'false' and MultiNetworkPolicy objects are ignored. If 'disableMultiNetwork' is 'true' then the value of this field is ignored.", - "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NetworkSpec", + "Kind": "KubeSchedulerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NetworkStatus": { - "description": "NetworkStatus is detailed operator status, which is distilled up to the Network clusteroperator object.", + "io.openshift.operator.v1.KubeSchedulerStatus": { "type": "object", "required": [ "readyReplicas" @@ -48764,7 +52570,34 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "latestAvailableRevisionReason": { + "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", + "type": "string" + }, + "nodeStatuses": { + "description": "nodeStatuses track the deployment values and errors across individual nodes", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" + }, + "x-kubernetes-list-map-keys": [ + "nodeName" + ], + "x-kubernetes-list-type": "map" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -48786,206 +52619,213 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NetworkStatus", + "Kind": "KubeSchedulerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeDisruptionPolicyClusterStatus": { - "description": "NodeDisruptionPolicyClusterStatus is the type for the status object, rendered by the controller as a merge of cluster defaults and user provided policies", + "io.openshift.operator.v1.KubeStorageVersionMigrator": { + "description": "KubeStorageVersionMigrator provides information to configure an operator to manage kube-storage-version-migrator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "metadata", + "spec" + ], "properties": { - "files": { - "description": "files is a list of MachineConfig file definitions and actions to take to changes on those paths", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusFile" - }, - "x-kubernetes-list-map-keys": [ - "path" - ], - "x-kubernetes-list-type": "map" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "sshkey": { - "description": "sshkey is the overall sshkey MachineConfig definition", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusSSHKey" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "units": { - "description": "units is a list MachineConfig unit definitions and actions to take on changes to those services", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusUnit" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "NodeDisruptionPolicyClusterStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.NodeDisruptionPolicyConfig": { - "description": "NodeDisruptionPolicyConfig is the overall spec definition for files/units/sshkeys", - "type": "object", - "properties": { - "files": { - "description": "files is a list of MachineConfig file definitions and actions to take to changes on those paths This list supports a maximum of 50 entries.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecFile" - }, - "x-kubernetes-list-map-keys": [ - "path" - ], - "x-kubernetes-list-type": "map" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "sshkey": { - "description": "sshkey maps to the ignition.sshkeys field in the MachineConfig object, definition an action for this will apply to all sshkey changes in the cluster", + "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecSSHKey" + "$ref": "#/definitions/io.openshift.operator.v1.KubeStorageVersionMigratorSpec" }, - "units": { - "description": "units is a list MachineConfig unit definitions and actions to take on changes to those services This list supports a maximum of 50 entries.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecUnit" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.KubeStorageVersionMigratorStatus" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicyConfig", - "Scope": "Namespaced" + "Kind": "KubeStorageVersionMigrator", + "Scope": "Clustered" } }, - "io.openshift.operator.v1.NodeDisruptionPolicySpecAction": { + "io.openshift.operator.v1.KubeStorageVersionMigratorList": { + "description": "KubeStorageVersionMigratorList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "type" + "metadata", + "items" ], "properties": { - "reload": { - "description": "reload specifies the service to reload, only valid if type is reload", - "$ref": "#/definitions/io.openshift.operator.v1.ReloadService" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "restart": { - "description": "restart specifies the service to restart, only valid if type is restart", - "$ref": "#/definitions/io.openshift.operator.v1.RestartService" + "items": { + "description": "Items contains the items", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.KubeStorageVersionMigrator" + } }, - "type": { - "description": "type represents the commands that will be carried out if this NodeDisruptionPolicySpecActionType is executed Valid values are Reboot, Drain, Reload, Restart, DaemonReload and None. reload/restart requires a corresponding service target specified in the reload/restart field. Other values require no further configuration", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicySpecAction", + "Kind": "KubeStorageVersionMigratorList", "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "type", - "fields-to-discriminateBy": { - "reload": "Reload", - "restart": "Restart" - } - } - ] + } }, - "io.openshift.operator.v1.NodeDisruptionPolicySpecFile": { - "description": "NodeDisruptionPolicySpecFile is a file entry and corresponding actions to take and is used in the NodeDisruptionPolicyConfig object", + "io.openshift.operator.v1.KubeStorageVersionMigratorSpec": { "type": "object", "required": [ - "path", - "actions" + "managementState" ], "properties": { - "actions": { - "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecAction" - }, - "x-kubernetes-list-type": "atomic" + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "path": { - "description": "path is the location of a file being managed through a MachineConfig. The Actions in the policy will apply to changes to the file at this path.", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" + }, + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicySpecFile", + "Kind": "KubeStorageVersionMigratorSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeDisruptionPolicySpecSSHKey": { - "description": "NodeDisruptionPolicySpecSSHKey is actions to take for any SSHKey change and is used in the NodeDisruptionPolicyConfig object", + "io.openshift.operator.v1.KubeStorageVersionMigratorStatus": { "type": "object", "required": [ - "actions" + "readyReplicas" ], "properties": { - "actions": { - "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", + "conditions": { + "description": "conditions is a list of conditions and their status", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecAction" + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" + }, + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicySpecSSHKey", + "Kind": "KubeStorageVersionMigratorStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeDisruptionPolicySpecUnit": { - "description": "NodeDisruptionPolicySpecUnit is a systemd unit name and corresponding actions to take and is used in the NodeDisruptionPolicyConfig object", + "io.openshift.operator.v1.LoadBalancerStrategy": { + "description": "LoadBalancerStrategy holds parameters for a load balancer.", "type": "object", "required": [ - "name", - "actions" + "scope" ], "properties": { - "actions": { - "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", + "allowedSourceRanges": { + "description": "allowedSourceRanges specifies an allowlist of IP address ranges to which access to the load balancer should be restricted. Each range must be specified using CIDR notation (e.g. \"10.0.0.0/8\" or \"fd00::/8\"). If no range is specified, \"0.0.0.0/0\" for IPv4 and \"::/0\" for IPv6 are used by default, which allows all source addresses.\n\nTo facilitate migration from earlier versions of OpenShift that did not have the allowedSourceRanges field, you may set the service.beta.kubernetes.io/load-balancer-source-ranges annotation on the \"router-\u003cingresscontroller name\u003e\" service in the \"openshift-ingress\" namespace, and this annotation will take effect if allowedSourceRanges is empty on OpenShift 4.12.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecAction" + "type": "string", + "default": "" }, "x-kubernetes-list-type": "atomic" }, - "name": { - "description": "name represents the service name of a systemd service managed through a MachineConfig Actions specified will be applied for changes to the named service. Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", + "dnsManagementPolicy": { + "description": "dnsManagementPolicy indicates if the lifecycle of the wildcard DNS record associated with the load balancer service will be managed by the ingress operator. It defaults to Managed. Valid values are: Managed and Unmanaged.", + "type": "string", + "default": "Managed" + }, + "providerParameters": { + "description": "providerParameters holds desired load balancer information specific to the underlying infrastructure provider.\n\nIf empty, defaults will be applied. See specific providerParameters fields for details about their defaults.", + "$ref": "#/definitions/io.openshift.operator.v1.ProviderLoadBalancerParameters" + }, + "scope": { + "description": "scope indicates the scope at which the load balancer is exposed. Possible values are \"External\" and \"Internal\".", "type": "string", "default": "" } @@ -48994,43 +52834,27 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicySpecUnit", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.NodeDisruptionPolicyStatus": { - "type": "object", - "properties": { - "clusterPolicies": { - "description": "clusterPolicies is a merge of cluster default and user provided node disruption policies.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyClusterStatus" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "NodeDisruptionPolicyStatus", + "Kind": "LoadBalancerStrategy", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeDisruptionPolicyStatusAction": { + "io.openshift.operator.v1.LoggingDestination": { + "description": "LoggingDestination describes a destination for log messages.", "type": "object", "required": [ "type" ], "properties": { - "reload": { - "description": "reload specifies the service to reload, only valid if type is reload", - "$ref": "#/definitions/io.openshift.operator.v1.ReloadService" + "container": { + "description": "container holds parameters for the Container logging destination. Present only if type is Container.", + "$ref": "#/definitions/io.openshift.operator.v1.ContainerLoggingDestinationParameters" }, - "restart": { - "description": "restart specifies the service to restart, only valid if type is restart", - "$ref": "#/definitions/io.openshift.operator.v1.RestartService" + "syslog": { + "description": "syslog holds parameters for a syslog endpoint. Present only if type is Syslog.", + "$ref": "#/definitions/io.openshift.operator.v1.SyslogLoggingDestinationParameters" }, "type": { - "description": "type represents the commands that will be carried out if this NodeDisruptionPolicyStatusActionType is executed Valid values are Reboot, Drain, Reload, Restart, DaemonReload, None and Special. reload/restart requires a corresponding service target specified in the reload/restart field. Other values require no further configuration", + "description": "type is the type of destination for logs. It must be one of the following:\n\n* Container\n\nThe ingress operator configures the sidecar container named \"logs\" on the ingress controller pod and configures the ingress controller to write logs to the sidecar. The logs are then available as container logs. The expectation is that the administrator configures a custom logging solution that reads logs from this sidecar. Note that using container logs means that logs may be dropped if the rate of logs exceeds the container runtime's or the custom logging solution's capacity.\n\n* Syslog\n\nLogs are sent to a syslog endpoint. The administrator must specify an endpoint that can receive syslog messages. The expectation is that the administrator has configured a custom syslog instance.", "type": "string", "default": "" } @@ -49039,304 +52863,341 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicyStatusAction", + "Kind": "LoggingDestination", "Scope": "Namespaced" }, "x-kubernetes-unions": [ { "discriminator": "type", "fields-to-discriminateBy": { - "reload": "Reload", - "restart": "Restart" + "container": "Container", + "syslog": "Syslog" } } ] }, - "io.openshift.operator.v1.NodeDisruptionPolicyStatusFile": { - "description": "NodeDisruptionPolicyStatusFile is a file entry and corresponding actions to take and is used in the NodeDisruptionPolicyClusterStatus object", + "io.openshift.operator.v1.MTUMigration": { + "description": "MTUMigration contains infomation about MTU migration.", "type": "object", - "required": [ - "path", - "actions" - ], "properties": { - "actions": { - "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusAction" - }, - "x-kubernetes-list-type": "atomic" + "machine": { + "description": "machine contains MTU migration configuration for the machine's uplink. Needs to be migrated along with the default network MTU unless the current uplink MTU already accommodates the default network MTU.", + "$ref": "#/definitions/io.openshift.operator.v1.MTUMigrationValues" }, - "path": { - "description": "path is the location of a file being managed through a MachineConfig. The Actions in the policy will apply to changes to the file at this path.", - "type": "string", - "default": "" + "network": { + "description": "network contains information about MTU migration for the default network. Migrations are only allowed to MTU values lower than the machine's uplink MTU by the minimum appropriate offset.", + "$ref": "#/definitions/io.openshift.operator.v1.MTUMigrationValues" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicyStatusFile", + "Kind": "MTUMigration", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeDisruptionPolicyStatusSSHKey": { - "description": "NodeDisruptionPolicyStatusSSHKey is actions to take for any SSHKey change and is used in the NodeDisruptionPolicyClusterStatus object", + "io.openshift.operator.v1.MTUMigrationValues": { + "description": "MTUMigrationValues contains the values for a MTU migration.", "type": "object", "required": [ - "actions" + "to" ], "properties": { - "actions": { - "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusAction" - }, - "x-kubernetes-list-type": "atomic" + "from": { + "description": "from is the MTU to migrate from.", + "type": "integer", + "format": "int64" + }, + "to": { + "description": "to is the MTU to migrate to.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicyStatusSSHKey", + "Kind": "MTUMigrationValues", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeDisruptionPolicyStatusUnit": { - "description": "NodeDisruptionPolicyStatusUnit is a systemd unit name and corresponding actions to take and is used in the NodeDisruptionPolicyClusterStatus object", + "io.openshift.operator.v1.MachineConfiguration": { + "description": "MachineConfiguration provides information to configure an operator to manage Machine Configuration.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "name", - "actions" + "metadata", + "spec" ], "properties": { - "actions": { - "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusAction" - }, - "x-kubernetes-list-type": "atomic" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "name": { - "description": "name represents the service name of a systemd service managed through a MachineConfig Actions specified will be applied for changes to the named service. Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "description": "spec is the specification of the desired behavior of the Machine Config Operator", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.MachineConfigurationSpec" + }, + "status": { + "description": "status is the most recently observed status of the Machine Config Operator", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.MachineConfigurationStatus" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeDisruptionPolicyStatusUnit", - "Scope": "Namespaced" + "Kind": "MachineConfiguration", + "Scope": "Clustered" } }, - "io.openshift.operator.v1.NodePlacement": { - "description": "NodePlacement describes node scheduling configuration for an ingress controller.", + "io.openshift.operator.v1.MachineConfigurationList": { + "description": "MachineConfigurationList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", + "required": [ + "metadata", + "items" + ], "properties": { - "nodeSelector": { - "description": "nodeSelector is the node selector applied to ingress controller deployments.\n\nIf set, the specified selector is used and replaces the default.\n\nIf unset, the default depends on the value of the defaultPlacement field in the cluster config.openshift.io/v1/ingresses status.\n\nWhen defaultPlacement is Workers, the default is:\n\n kubernetes.io/os: linux\n node-role.kubernetes.io/worker: ''\n\nWhen defaultPlacement is ControlPlane, the default is:\n\n kubernetes.io/os: linux\n node-role.kubernetes.io/master: ''\n\nThese defaults are subject to change.\n\nNote that using nodeSelector.matchExpressions is not supported. Only nodeSelector.matchLabels may be used. This is a limitation of the Kubernetes API: the pod spec does not allow complex expressions for node selectors.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "tolerations": { - "description": "tolerations is a list of tolerations applied to ingress controller deployments.\n\nThe default is an empty list.\n\nSee https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/", + "items": { + "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "NodePlacement", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.NodePortStrategy": { - "description": "NodePortStrategy holds parameters for the NodePortService endpoint publishing strategy.", - "type": "object", - "properties": { - "protocol": { - "description": "protocol specifies whether the IngressController expects incoming connections to use plain TCP or whether the IngressController expects PROXY protocol.\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nThe following values are valid for this field:\n\n* The empty string. * \"TCP\". * \"PROXY\".\n\nThe empty string specifies the default, which is TCP without PROXY protocol. Note that the default is subject to change.", + "$ref": "#/definitions/io.openshift.operator.v1.MachineConfiguration" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodePortStrategy", + "Kind": "MachineConfigurationList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.NodeStatus": { - "description": "NodeStatus provides information about the current state of a particular node managed by this operator.", + "io.openshift.operator.v1.MachineConfigurationSpec": { "type": "object", "required": [ - "nodeName", - "currentRevision" + "managementState", + "forceRedeploymentReason" ], "properties": { - "currentRevision": { - "description": "currentRevision is the generation of the most recently successful deployment", - "type": "integer", - "format": "int32", - "default": 0 - }, - "lastFailedCount": { - "description": "lastFailedCount is how often the installer pod of the last failed revision failed.", + "failedRevisionLimit": { + "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", "type": "integer", "format": "int32" }, - "lastFailedReason": { - "description": "lastFailedReason is a machine readable failure reason string.", + "forceRedeploymentReason": { + "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", + "type": "string", + "default": "" + }, + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, - "lastFailedRevision": { - "description": "lastFailedRevision is the generation of the deployment we tried and failed to deploy.", - "type": "integer", - "format": "int32" + "managedBootImages": { + "description": "managedBootImages allows configuration for the management of boot images for machine resources within the cluster. This configuration allows users to select resources that should be updated to the latest boot images during cluster upgrades, ensuring that new machines always boot with the current cluster version's boot image. When omitted, no boot images will be updated.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ManagedBootImages" }, - "lastFailedRevisionErrors": { - "description": "lastFailedRevisionErrors is a list of human readable errors during the failed deployment referenced in lastFailedRevision.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", + "type": "string", + "default": "" }, - "lastFailedTime": { - "description": "lastFailedTime is the time the last failed revision failed the last time.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "nodeDisruptionPolicy": { + "description": "nodeDisruptionPolicy allows an admin to set granular node disruption actions for MachineConfig-based updates, such as drains, service reloads, etc. Specifying this will allow for less downtime when doing small configuration updates to the cluster. This configuration has no effect on cluster upgrades which will still incur node disruption where required.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyConfig" }, - "lastFallbackCount": { - "description": "lastFallbackCount is how often a fallback to a previous revision happened.", - "type": "integer", - "format": "int32" + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "nodeName": { - "description": "nodeName is the name of the node", - "type": "string", - "default": "" + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "targetRevision": { - "description": "targetRevision is the generation of the deployment we're trying to apply", + "succeededRevisionLimit": { + "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", "type": "integer", "format": "int32" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "NodeStatus", + "Kind": "MachineConfigurationSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OAuthAPIServerStatus": { + "io.openshift.operator.v1.MachineConfigurationStatus": { "type": "object", "properties": { - "latestAvailableRevision": { - "description": "LatestAvailableRevision is the latest revision used as suffix of revisioned secrets like encryption-config. A new revision causes a new deployment of pods.", + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" + }, + "nodeDisruptionPolicyStatus": { + "description": "nodeDisruptionPolicyStatus status reflects what the latest cluster-validated policies are, and will be used by the Machine Config Daemon during future node updates.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatus" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", "type": "integer", - "format": "int32" + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OAuthAPIServerStatus", + "Kind": "MachineConfigurationStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OVNKubernetesConfig": { - "description": "ovnKubernetesConfig contains the configuration parameters for networks using the ovn-kubernetes network project", + "io.openshift.operator.v1.MachineManager": { + "description": "MachineManager describes a target machine resource that is registered for boot image updates. It stores identifying information such as the resource type and the API Group of the resource. It also provides granular control via the selection field.", "type": "object", + "required": [ + "resource", + "apiGroup", + "selection" + ], "properties": { - "egressIPConfig": { - "description": "egressIPConfig holds the configuration for EgressIP options.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.EgressIPConfig" - }, - "gatewayConfig": { - "description": "gatewayConfig holds the configuration for node gateway options.", - "$ref": "#/definitions/io.openshift.operator.v1.GatewayConfig" - }, - "genevePort": { - "description": "geneve port is the UDP port to be used by geneve encapulation. Default is 6081", - "type": "integer", - "format": "int64" - }, - "hybridOverlayConfig": { - "description": "HybridOverlayConfig configures an additional overlay network for peers that are not using OVN.", - "$ref": "#/definitions/io.openshift.operator.v1.HybridOverlayConfig" - }, - "ipsecConfig": { - "description": "ipsecConfig enables and configures IPsec for pods on the pod network within the cluster.", - "default": { - "mode": "Disabled" - }, - "$ref": "#/definitions/io.openshift.operator.v1.IPsecConfig" - }, - "ipv4": { - "description": "ipv4 allows users to configure IP settings for IPv4 connections. When ommitted, this means no opinions and the default configuration is used. Check individual fields within ipv4 for details of default values.", - "$ref": "#/definitions/io.openshift.operator.v1.IPv4OVNKubernetesConfig" - }, - "ipv6": { - "description": "ipv6 allows users to configure IP settings for IPv6 connections. When ommitted, this means no opinions and the default configuration is used. Check individual fields within ipv4 for details of default values.", - "$ref": "#/definitions/io.openshift.operator.v1.IPv6OVNKubernetesConfig" - }, - "mtu": { - "description": "mtu is the MTU to use for the tunnel interface. This must be 100 bytes smaller than the uplink mtu. Default is 1400", - "type": "integer", - "format": "int64" - }, - "policyAuditConfig": { - "description": "policyAuditConfig is the configuration for network policy audit events. If unset, reported defaults are used.", - "$ref": "#/definitions/io.openshift.operator.v1.PolicyAuditConfig" + "apiGroup": { + "description": "apiGroup is name of the APIGroup that the machine management resource belongs to. The only current valid value is machine.openshift.io. machine.openshift.io means that the machine manager will only register resources that belong to OpenShift machine API group.", + "type": "string", + "default": "" }, - "routeAdvertisements": { - "description": "routeAdvertisements determines if the functionality to advertise cluster network routes through a dynamic routing protocol, such as BGP, is enabled or not. This functionality is configured through the ovn-kubernetes RouteAdvertisements CRD. Requires the 'FRR' routing capability provider to be enabled as an additional routing capability. Allowed values are \"Enabled\", \"Disabled\" and ommited. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is \"Disabled\".", - "type": "string" + "resource": { + "description": "resource is the machine management resource's type. The only current valid value is machinesets. machinesets means that the machine manager will only register resources of the kind MachineSet.", + "type": "string", + "default": "" }, - "v4InternalSubnet": { - "description": "v4InternalSubnet is a v4 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. Default is 100.64.0.0/16", - "type": "string" + "selection": { + "description": "selection allows granular control of the machine management resources that will be registered for boot image updates.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.MachineManagerSelector" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "MachineManager", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.MachineManagerSelector": { + "type": "object", + "required": [ + "mode" + ], + "properties": { + "mode": { + "description": "mode determines how machine managers will be selected for updates. Valid values are All and Partial. All means that every resource matched by the machine manager will be updated. Partial requires specified selector(s) and allows customisation of which resources matched by the machine manager will be updated.", + "type": "string", + "default": "" }, - "v6InternalSubnet": { - "description": "v6InternalSubnet is a v6 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. Default is fd98::/48", - "type": "string" + "partial": { + "description": "partial provides label selector(s) that can be used to match machine management resources. Only permitted when mode is set to \"Partial\".", + "$ref": "#/definitions/io.openshift.operator.v1.PartialSelector" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "MachineManagerSelector", + "Scope": "Namespaced" + }, + "x-kubernetes-unions": [ + { + "discriminator": "mode", + "fields-to-discriminateBy": { + "partial": "Partial" + } + } + ] + }, + "io.openshift.operator.v1.ManagedBootImages": { + "type": "object", + "properties": { + "machineManagers": { + "description": "machineManagers can be used to register machine management resources for boot image updates. The Machine Config Operator will watch for changes to this list. Only one entry is permitted per type of machine management resource.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.MachineManager" + }, + "x-kubernetes-list-map-keys": [ + "resource", + "apiGroup" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OVNKubernetesConfig", + "Kind": "ManagedBootImages", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OpenShiftAPIServer": { - "description": "OpenShiftAPIServer provides information to configure an operator to manage openshift-apiserver.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.MyOperatorResource": { + "description": "MyOperatorResource is an example operator configuration type\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ "metadata", - "spec" + "spec", + "status" ], "properties": { "apiVersion": { @@ -49353,63 +53214,23 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec is the specification of the desired behavior of the OpenShift API Server.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftAPIServerSpec" + "$ref": "#/definitions/io.openshift.operator.v1.MyOperatorResourceSpec" }, "status": { - "description": "status defines the observed status of the OpenShift API Server.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftAPIServerStatus" + "$ref": "#/definitions/io.openshift.operator.v1.MyOperatorResourceStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftAPIServer", - "Scope": "Clustered" - } - }, - "io.openshift.operator.v1.OpenShiftAPIServerList": { - "description": "OpenShiftAPIServerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "description": "Items contains the items", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftAPIServer" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "OpenShiftAPIServerList", + "Kind": "MyOperatorResource", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OpenShiftAPIServerSpec": { + "io.openshift.operator.v1.MyOperatorResourceSpec": { "type": "object", "required": [ "managementState" @@ -49443,11 +53264,11 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftAPIServerSpec", + "Kind": "MyOperatorResourceSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OpenShiftAPIServerStatus": { + "io.openshift.operator.v1.MyOperatorResourceStatus": { "type": "object", "required": [ "readyReplicas" @@ -49472,10 +53293,16 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, "latestAvailableRevision": { - "description": "latestAvailableRevision is the latest revision used as suffix of revisioned secrets like encryption-config. A new revision causes a new deployment of pods.", + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", "type": "integer", "format": "int32" }, @@ -49499,17 +53326,34 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftAPIServerStatus", + "Kind": "MyOperatorResourceStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OpenShiftControllerManager": { - "description": "OpenShiftControllerManager provides information to configure an operator to manage openshift-controller-manager.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.NetFlowConfig": { + "type": "object", + "properties": { + "collectors": { + "description": "netFlow defines the NetFlow collectors that will consume the flow data exported from OVS. It is a list of strings formatted as ip:port with a maximum of ten items", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "NetFlowConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.Network": { + "description": "Network describes the cluster's desired network configuration. It is consumed by the cluster-network-operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", - "required": [ - "metadata", - "spec" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -49526,26 +53370,25 @@ }, "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftControllerManagerSpec" + "$ref": "#/definitions/io.openshift.operator.v1.NetworkSpec" }, "status": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftControllerManagerStatus" + "$ref": "#/definitions/io.openshift.operator.v1.NetworkStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftControllerManager", + "Kind": "Network", "Scope": "Clustered" } }, - "io.openshift.operator.v1.OpenShiftControllerManagerList": { - "description": "OpenShiftControllerManagerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.NetworkList": { + "description": "NetworkList contains a list of Network configurations\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "items" ], "properties": { @@ -49554,11 +53397,10 @@ "type": "string" }, "items": { - "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftControllerManager" + "$ref": "#/definitions/io.openshift.operator.v1.Network" } }, "kind": { @@ -49575,180 +53417,100 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftControllerManagerList", + "Kind": "NetworkList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OpenShiftControllerManagerSpec": { + "io.openshift.operator.v1.NetworkMigration": { + "description": "NetworkMigration represents the cluster network migration configuration.", "type": "object", - "required": [ - "managementState" - ], "properties": { - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" + "features": { + "description": "features was previously used to configure which network plugin features would be migrated in a network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", + "$ref": "#/definitions/io.openshift.operator.v1.FeaturesMigration" }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", - "type": "string", - "default": "" + "mode": { + "description": "mode indicates the mode of network type migration. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", + "type": "string" }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "mtu": { + "description": "mtu contains the MTU migration configuration. Set this to allow changing the MTU values for the default network. If unset, the operation of changing the MTU for the default network will be rejected.", + "$ref": "#/definitions/io.openshift.operator.v1.MTUMigration" }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "networkType": { + "description": "networkType was previously used when changing the default network type. DEPRECATED: network type migration is no longer supported, and setting this to a non-empty value will result in the network operator rejecting the configuration.", "type": "string" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OpenShiftControllerManagerSpec", + "Kind": "NetworkMigration", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OpenShiftControllerManagerStatus": { + "io.openshift.operator.v1.NetworkSpec": { + "description": "NetworkSpec is the top-level network configuration object.", "type": "object", "required": [ - "readyReplicas" + "managementState", + "clusterNetwork", + "serviceNetwork", + "defaultNetwork" ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", + "additionalNetworks": { + "description": "additionalNetworks is a list of extra networks to make available to pods when multiple networks are enabled.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + "$ref": "#/definitions/io.openshift.operator.v1.AdditionalNetworkDefinition" }, "x-kubernetes-list-map-keys": [ - "type" + "name" ], "x-kubernetes-list-type": "map" }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", + "additionalRoutingCapabilities": { + "description": "additionalRoutingCapabilities describes components and relevant configuration providing additional routing capabilities. When set, it enables such components and the usage of the routing capabilities they provide for the machine network. Upstream operators, like MetalLB operator, requiring these capabilities may rely on, or automatically set this attribute. Network plugins may leverage advanced routing capabilities acquired through the enablement of these components but may require specific configuration on their side to do so; refer to their respective documentation and configuration options.", + "$ref": "#/definitions/io.openshift.operator.v1.AdditionalRoutingCapabilities" + }, + "clusterNetwork": { + "description": "clusterNetwork is the IP address pool to use for pod IPs. Some network providers support multiple ClusterNetworks. Others only support one. This is equivalent to the cluster-cidr.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + "$ref": "#/definitions/io.openshift.operator.v1.ClusterNetworkEntry" }, "x-kubernetes-list-type": "atomic" }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 + "defaultNetwork": { + "description": "defaultNetwork is the \"default\" network that all pods will receive", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.DefaultNetworkDefinition" }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "OpenShiftControllerManagerStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.OpenShiftSDNConfig": { - "description": "OpenShiftSDNConfig was used to configure the OpenShift SDN plugin. It is no longer used.", - "type": "object", - "required": [ - "mode" - ], - "properties": { - "enableUnidling": { - "description": "enableUnidling controls whether or not the service proxy will support idling and unidling of services. By default, unidling is enabled.", + "deployKubeProxy": { + "description": "deployKubeProxy specifies whether or not a standalone kube-proxy should be deployed by the operator. Some network providers include kube-proxy or similar functionality. If unset, the plugin will attempt to select the correct value, which is false when ovn-kubernetes is used and true otherwise.", "type": "boolean" }, - "mode": { - "description": "mode is one of \"Multitenant\", \"Subnet\", or \"NetworkPolicy\"", - "type": "string", - "default": "" - }, - "mtu": { - "description": "mtu is the mtu to use for the tunnel interface. Defaults to 1450 if unset. This must be 50 bytes smaller than the machine's uplink.", - "type": "integer", - "format": "int64" - }, - "useExternalOpenvswitch": { - "description": "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored.", + "disableMultiNetwork": { + "description": "disableMultiNetwork specifies whether or not multiple pod network support should be disabled. If unset, this property defaults to 'false' and multiple network support is enabled.", "type": "boolean" }, - "vxlanPort": { - "description": "vxlanPort is the port to use for all vxlan packets. The default is 4789.", - "type": "integer", - "format": "int64" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "OpenShiftSDNConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.OperatorCondition": { - "description": "OperatorCondition is just the standard condition fields.", - "type": "object", - "required": [ - "type", - "status" - ], - "properties": { - "lastTransitionTime": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { - "type": "string" + "disableNetworkDiagnostics": { + "description": "disableNetworkDiagnostics specifies whether or not PodNetworkConnectivityCheck CRs from a test pod to every node, apiserver and LB should be disabled or not. If unset, this property defaults to 'false' and network diagnostics is enabled. Setting this to 'true' would reduce the additional load of the pods performing the checks.", + "type": "boolean", + "default": false }, - "reason": { - "type": "string" + "exportNetworkFlows": { + "description": "exportNetworkFlows enables and configures the export of network flow metadata from the pod network by using protocols NetFlow, SFlow or IPFIX. Currently only supported on OVN-Kubernetes plugin. If unset, flows will not be exported to any collector.", + "$ref": "#/definitions/io.openshift.operator.v1.ExportNetworkFlows" }, - "status": { - "type": "string", - "default": "" + "kubeProxyConfig": { + "description": "kubeProxyConfig lets us configure desired proxy configuration, if deployKubeProxy is true. If not specified, sensible defaults will be chosen by OpenShift directly.", + "$ref": "#/definitions/io.openshift.operator.v1.ProxyConfig" }, - "type": { - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "OperatorCondition", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.OperatorSpec": { - "description": "OperatorSpec contains common fields operators need. It is intended to be anonymous included inside of the Spec struct for your particular operator.", - "type": "object", - "required": [ - "managementState" - ], - "properties": { "logLevel": { "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" @@ -49758,6 +53520,10 @@ "type": "string", "default": "" }, + "migration": { + "description": "migration enables and configures cluster network migration, for network changes that cannot be made instantly.", + "$ref": "#/definitions/io.openshift.operator.v1.NetworkMigration" + }, "observedConfig": { "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", "default": {}, @@ -49767,21 +53533,35 @@ "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, + "serviceNetwork": { + "description": "serviceNetwork is the ip address pool to use for Service IPs Currently, all existing network providers only support a single value here, but this is an array to allow for growth.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" + }, "unsupportedConfigOverrides": { "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "useMultiNetworkPolicy": { + "description": "useMultiNetworkPolicy enables a controller which allows for MultiNetworkPolicy objects to be used on additional networks as created by Multus CNI. MultiNetworkPolicy are similar to NetworkPolicy objects, but NetworkPolicy objects only apply to the primary interface. With MultiNetworkPolicy, you can control the traffic that a pod can receive over the secondary interfaces. If unset, this property defaults to 'false' and MultiNetworkPolicy objects are ignored. If 'disableMultiNetwork' is 'true' then the value of this field is ignored.", + "type": "boolean" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OperatorSpec", + "Kind": "NetworkSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.OperatorStatus": { + "io.openshift.operator.v1.NetworkStatus": { + "description": "NetworkStatus is detailed operator status, which is distilled up to the Network clusteroperator object.", "type": "object", "required": [ "readyReplicas" @@ -49806,7 +53586,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -49828,222 +53619,110 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "OperatorStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.PartialSelector": { - "description": "PartialSelector provides label selector(s) that can be used to match machine management resources.", - "type": "object", - "properties": { - "machineResourceSelector": { - "description": "machineResourceSelector is a label selector that can be used to select machine resources like MachineSets.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "PartialSelector", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.Perspective": { - "description": "Perspective defines a perspective that cluster admins want to show/hide in the perspective switcher dropdown", - "type": "object", - "required": [ - "id", - "visibility" - ], - "properties": { - "id": { - "description": "id defines the id of the perspective. Example: \"dev\", \"admin\". The available perspective ids can be found in the code snippet section next to the yaml editor. Incorrect or unknown ids will be ignored.", - "type": "string", - "default": "" - }, - "pinnedResources": { - "description": "pinnedResources defines the list of default pinned resources that users will see on the perspective navigation if they have not customized these pinned resources themselves. The list of available Kubernetes resources could be read via `kubectl api-resources`. The console will also provide a configuration UI and a YAML snippet that will list the available resources that can be pinned to the navigation. Incorrect or unknown resources will be ignored.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.PinnedResourceReference" - } - }, - "visibility": { - "description": "visibility defines the state of perspective along with access review checks if needed for that perspective.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.PerspectiveVisibility" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "Perspective", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.PerspectiveVisibility": { - "description": "PerspectiveVisibility defines the criteria to show/hide a perspective", - "type": "object", - "required": [ - "state" - ], - "properties": { - "accessReview": { - "description": "accessReview defines required and missing access review checks.", - "$ref": "#/definitions/io.openshift.operator.v1.ResourceAttributesAccessReview" - }, - "state": { - "description": "state defines the perspective is enabled or disabled or access review check is required.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "PerspectiveVisibility", - "Scope": "Namespaced" - }, - "x-kubernetes-unions": [ - { - "discriminator": "state", - "fields-to-discriminateBy": { - "accessReview": "AccessReview" - } - } - ] - }, - "io.openshift.operator.v1.PinnedResourceReference": { - "description": "PinnedResourceReference includes the group, version and type of resource", - "type": "object", - "required": [ - "group", - "version", - "resource" - ], - "properties": { - "group": { - "description": "group is the API Group of the Resource. Enter empty string for the core group. This value should consist of only lowercase alphanumeric characters, hyphens and periods. Example: \"\", \"apps\", \"build.openshift.io\", etc.", - "type": "string", - "default": "" - }, - "resource": { - "description": "resource is the type that is being referenced. It is normally the plural form of the resource kind in lowercase. This value should consist of only lowercase alphanumeric characters and hyphens. Example: \"deployments\", \"deploymentconfigs\", \"pods\", etc.", - "type": "string", - "default": "" - }, - "version": { - "description": "version is the API Version of the Resource. This value should consist of only lowercase alphanumeric characters. Example: \"v1\", \"v1beta1\", etc.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "PinnedResourceReference", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.PolicyAuditConfig": { - "type": "object", - "properties": { - "destination": { - "description": "destination is the location for policy log messages. Regardless of this config, persistent logs will always be dumped to the host at /var/log/ovn/ however Additionally syslog output may be configured as follows. Valid values are: - \"libc\" -\u003e to use the libc syslog() function of the host node's journdald process - \"udp:host:port\" -\u003e for sending syslog over UDP - \"unix:file\" -\u003e for using the UNIX domain socket directly - \"null\" -\u003e to discard all messages logged to syslog The default is \"null\"", - "type": "string" - }, - "maxFileSize": { - "description": "maxFilesSize is the max size an ACL_audit log file is allowed to reach before rotation occurs Units are in MB and the Default is 50MB", - "type": "integer", - "format": "int64" - }, - "maxLogFiles": { - "description": "maxLogFiles specifies the maximum number of ACL_audit log files that can be present.", - "type": "integer", - "format": "int32" - }, - "rateLimit": { - "description": "rateLimit is the approximate maximum number of messages to generate per-second per-node. If unset the default of 20 msg/sec is used.", - "type": "integer", - "format": "int64" - }, - "syslogFacility": { - "description": "syslogFacility the RFC5424 facility for generated messages, e.g. \"kern\". Default is \"local0\"", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "PolicyAuditConfig", + "Kind": "NetworkStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.PrivateStrategy": { - "description": "PrivateStrategy holds parameters for the Private endpoint publishing strategy.", + "io.openshift.operator.v1.NodeDisruptionPolicyClusterStatus": { + "description": "NodeDisruptionPolicyClusterStatus is the type for the status object, rendered by the controller as a merge of cluster defaults and user provided policies", "type": "object", "properties": { - "protocol": { - "description": "protocol specifies whether the IngressController expects incoming connections to use plain TCP or whether the IngressController expects PROXY protocol.\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nThe following values are valid for this field:\n\n* The empty string. * \"TCP\". * \"PROXY\".\n\nThe empty string specifies the default, which is TCP without PROXY protocol. Note that the default is subject to change.", - "type": "string" + "files": { + "description": "files is a list of MachineConfig file definitions and actions to take to changes on those paths", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusFile" + }, + "x-kubernetes-list-map-keys": [ + "path" + ], + "x-kubernetes-list-type": "map" + }, + "sshkey": { + "description": "sshkey is the overall sshkey MachineConfig definition", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusSSHKey" + }, + "units": { + "description": "units is a list MachineConfig unit definitions and actions to take on changes to those services", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusUnit" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "PrivateStrategy", + "Kind": "NodeDisruptionPolicyClusterStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ProjectAccess": { - "description": "ProjectAccess contains options for project access roles", + "io.openshift.operator.v1.NodeDisruptionPolicyConfig": { + "description": "NodeDisruptionPolicyConfig is the overall spec definition for files/units/sshkeys", "type": "object", "properties": { - "availableClusterRoles": { - "description": "availableClusterRoles is the list of ClusterRole names that are assignable to users through the project access tab.", + "files": { + "description": "files is a list of MachineConfig file definitions and actions to take to changes on those paths This list supports a maximum of 50 entries.", "type": "array", "items": { - "type": "string", - "default": "" - } + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecFile" + }, + "x-kubernetes-list-map-keys": [ + "path" + ], + "x-kubernetes-list-type": "map" + }, + "sshkey": { + "description": "sshkey maps to the ignition.sshkeys field in the MachineConfig object, definition an action for this will apply to all sshkey changes in the cluster", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecSSHKey" + }, + "units": { + "description": "units is a list MachineConfig unit definitions and actions to take on changes to those services This list supports a maximum of 50 entries.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecUnit" + }, + "x-kubernetes-list-map-keys": [ + "name" + ], + "x-kubernetes-list-type": "map" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ProjectAccess", + "Kind": "NodeDisruptionPolicyConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ProviderLoadBalancerParameters": { - "description": "ProviderLoadBalancerParameters holds desired load balancer information specific to the underlying infrastructure provider.", + "io.openshift.operator.v1.NodeDisruptionPolicySpecAction": { "type": "object", "required": [ "type" ], "properties": { - "aws": { - "description": "aws provides configuration settings that are specific to AWS load balancers.\n\nIf empty, defaults will be applied. See specific aws fields for details about their defaults.", - "$ref": "#/definitions/io.openshift.operator.v1.AWSLoadBalancerParameters" - }, - "gcp": { - "description": "gcp provides configuration settings that are specific to GCP load balancers.\n\nIf empty, defaults will be applied. See specific gcp fields for details about their defaults.", - "$ref": "#/definitions/io.openshift.operator.v1.GCPLoadBalancerParameters" + "reload": { + "description": "reload specifies the service to reload, only valid if type is reload", + "$ref": "#/definitions/io.openshift.operator.v1.ReloadService" }, - "ibm": { - "description": "ibm provides configuration settings that are specific to IBM Cloud load balancers.\n\nIf empty, defaults will be applied. See specific ibm fields for details about their defaults.", - "$ref": "#/definitions/io.openshift.operator.v1.IBMLoadBalancerParameters" + "restart": { + "description": "restart specifies the service to restart, only valid if type is restart", + "$ref": "#/definitions/io.openshift.operator.v1.RestartService" }, "type": { - "description": "type is the underlying infrastructure provider for the load balancer. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"IBM\", \"Nutanix\", \"OpenStack\", and \"VSphere\".", + "description": "type represents the commands that will be carried out if this NodeDisruptionPolicySpecActionType is executed Valid values are Reboot, Drain, Reload, Restart, DaemonReload and None. reload/restart requires a corresponding service target specified in the reload/restart field. Other values require no further configuration", "type": "string", "default": "" } @@ -50052,82 +53731,94 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ProviderLoadBalancerParameters", + "Kind": "NodeDisruptionPolicySpecAction", "Scope": "Namespaced" }, "x-kubernetes-unions": [ { "discriminator": "type", "fields-to-discriminateBy": { - "aws": "AWS", - "gcp": "GCP", - "ibm": "IBM" + "reload": "Reload", + "restart": "Restart" } } ] }, - "io.openshift.operator.v1.ProxyConfig": { - "description": "ProxyConfig defines the configuration knobs for kubeproxy All of these are optional and have sensible defaults", + "io.openshift.operator.v1.NodeDisruptionPolicySpecFile": { + "description": "NodeDisruptionPolicySpecFile is a file entry and corresponding actions to take and is used in the NodeDisruptionPolicyConfig object", "type": "object", + "required": [ + "path", + "actions" + ], "properties": { - "bindAddress": { - "description": "The address to \"bind\" on Defaults to 0.0.0.0", - "type": "string" - }, - "iptablesSyncPeriod": { - "description": "An internal kube-proxy parameter. In older releases of OCP, this sometimes needed to be adjusted in large clusters for performance reasons, but this is no longer necessary, and there is no reason to change this from the default value. Default: 30s", - "type": "string" + "actions": { + "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecAction" + }, + "x-kubernetes-list-type": "atomic" }, - "proxyArguments": { - "description": "Any additional arguments to pass to the kubeproxy process", - "type": "object", - "additionalProperties": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - } + "path": { + "description": "path is the location of a file being managed through a MachineConfig. The Actions in the policy will apply to changes to the file at this path.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ProxyConfig", + "Kind": "NodeDisruptionPolicySpecFile", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.QuickStarts": { - "description": "QuickStarts allow cluster admins to customize available ConsoleQuickStart resources.", + "io.openshift.operator.v1.NodeDisruptionPolicySpecSSHKey": { + "description": "NodeDisruptionPolicySpecSSHKey is actions to take for any SSHKey change and is used in the NodeDisruptionPolicyConfig object", "type": "object", + "required": [ + "actions" + ], "properties": { - "disabled": { - "description": "disabled is a list of ConsoleQuickStart resource names that are not shown to users.", + "actions": { + "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", "type": "array", "items": { - "type": "string", - "default": "" - } + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecAction" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "QuickStarts", + "Kind": "NodeDisruptionPolicySpecSSHKey", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ReloadService": { - "description": "ReloadService allows the user to specify the services to be reloaded", + "io.openshift.operator.v1.NodeDisruptionPolicySpecUnit": { + "description": "NodeDisruptionPolicySpecUnit is a systemd unit name and corresponding actions to take and is used in the NodeDisruptionPolicyConfig object", "type": "object", "required": [ - "serviceName" + "name", + "actions" ], "properties": { - "serviceName": { - "description": "serviceName is the full name (e.g. crio.service) of the service to be reloaded Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", + "actions": { + "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicySpecAction" + }, + "x-kubernetes-list-type": "atomic" + }, + "name": { + "description": "name represents the service name of a systemd service managed through a MachineConfig Actions specified will be applied for changes to the named service. Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", "type": "string", "default": "" } @@ -50136,48 +53827,43 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ReloadService", + "Kind": "NodeDisruptionPolicySpecUnit", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ResourceAttributesAccessReview": { - "description": "ResourceAttributesAccessReview defines the visibility of the perspective depending on the access review checks. `required` and `missing` can work together esp. in the case where the cluster admin wants to show another perspective to users without specific permissions. Out of `required` and `missing` atleast one property should be non-empty.", + "io.openshift.operator.v1.NodeDisruptionPolicyStatus": { "type": "object", "properties": { - "missing": { - "description": "missing defines a list of permission checks. The perspective will only be shown when at least one check fails. When omitted, the access review is skipped and the perspective will not be shown unless it is required to do so based on the configuration of the required access review list.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.authorization.v1.ResourceAttributes" - } - }, - "required": { - "description": "required defines a list of permission checks. The perspective will only be shown when all checks are successful. When omitted, the access review is skipped and the perspective will not be shown unless it is required to do so based on the configuration of the missing access review list.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.api.authorization.v1.ResourceAttributes" - } + "clusterPolicies": { + "description": "clusterPolicies is a merge of cluster default and user provided node disruption policies.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyClusterStatus" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ResourceAttributesAccessReview", + "Kind": "NodeDisruptionPolicyStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.RestartService": { - "description": "RestartService allows the user to specify the services to be restarted", + "io.openshift.operator.v1.NodeDisruptionPolicyStatusAction": { "type": "object", "required": [ - "serviceName" + "type" ], "properties": { - "serviceName": { - "description": "serviceName is the full name (e.g. crio.service) of the service to be restarted Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", + "reload": { + "description": "reload specifies the service to reload, only valid if type is reload", + "$ref": "#/definitions/io.openshift.operator.v1.ReloadService" + }, + "restart": { + "description": "restart specifies the service to restart, only valid if type is restart", + "$ref": "#/definitions/io.openshift.operator.v1.RestartService" + }, + "type": { + "description": "type represents the commands that will be carried out if this NodeDisruptionPolicyStatusActionType is executed Valid values are Reboot, Drain, Reload, Restart, DaemonReload, None and Special. reload/restart requires a corresponding service target specified in the reload/restart field. Other values require no further configuration", "type": "string", "default": "" } @@ -50186,40 +53872,63 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "RestartService", + "Kind": "NodeDisruptionPolicyStatusAction", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "reload": "Reload", + "restart": "Restart" + } + } + ] }, - "io.openshift.operator.v1.RouteAdmissionPolicy": { - "description": "RouteAdmissionPolicy is an admission policy for allowing new route claims.", + "io.openshift.operator.v1.NodeDisruptionPolicyStatusFile": { + "description": "NodeDisruptionPolicyStatusFile is a file entry and corresponding actions to take and is used in the NodeDisruptionPolicyClusterStatus object", "type": "object", + "required": [ + "path", + "actions" + ], "properties": { - "namespaceOwnership": { - "description": "namespaceOwnership describes how host name claims across namespaces should be handled.\n\nValue must be one of:\n\n- Strict: Do not allow routes in different namespaces to claim the same host.\n\n- InterNamespaceAllowed: Allow routes to claim different paths of the same\n host name across namespaces.\n\nIf empty, the default is Strict.", - "type": "string" + "actions": { + "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusAction" + }, + "x-kubernetes-list-type": "atomic" }, - "wildcardPolicy": { - "description": "wildcardPolicy describes how routes with wildcard policies should be handled for the ingress controller. WildcardPolicy controls use of routes [1] exposed by the ingress controller based on the route's wildcard policy.\n\n[1] https://github.com/openshift/api/blob/master/route/v1/types.go\n\nNote: Updating WildcardPolicy from WildcardsAllowed to WildcardsDisallowed will cause admitted routes with a wildcard policy of Subdomain to stop working. These routes must be updated to a wildcard policy of None to be readmitted by the ingress controller.\n\nWildcardPolicy supports WildcardsAllowed and WildcardsDisallowed values.\n\nIf empty, defaults to \"WildcardsDisallowed\".", - "type": "string" + "path": { + "description": "path is the location of a file being managed through a MachineConfig. The Actions in the policy will apply to changes to the file at this path.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "RouteAdmissionPolicy", + "Kind": "NodeDisruptionPolicyStatusFile", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.SFlowConfig": { + "io.openshift.operator.v1.NodeDisruptionPolicyStatusSSHKey": { + "description": "NodeDisruptionPolicyStatusSSHKey is actions to take for any SSHKey change and is used in the NodeDisruptionPolicyClusterStatus object", "type": "object", + "required": [ + "actions" + ], "properties": { - "collectors": { - "description": "sFlowCollectors is list of strings formatted as ip:port with a maximum of ten items", + "actions": { + "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusAction" }, "x-kubernetes-list-type": "atomic" } @@ -50228,226 +53937,222 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "SFlowConfig", + "Kind": "NodeDisruptionPolicyStatusSSHKey", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.Server": { - "description": "Server defines the schema for a server that runs per instance of CoreDNS.", + "io.openshift.operator.v1.NodeDisruptionPolicyStatusUnit": { + "description": "NodeDisruptionPolicyStatusUnit is a systemd unit name and corresponding actions to take and is used in the NodeDisruptionPolicyClusterStatus object", "type": "object", "required": [ "name", - "zones", - "forwardPlugin" + "actions" ], "properties": { - "forwardPlugin": { - "description": "forwardPlugin defines a schema for configuring CoreDNS to proxy DNS messages to upstream resolvers.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ForwardPlugin" + "actions": { + "description": "actions represents the series of commands to be executed on changes to the file at the corresponding file path. Actions will be applied in the order that they are set in this list. If there are other incoming changes to other MachineConfig entries in the same update that require a reboot, the reboot will supercede these actions. Valid actions are Reboot, Drain, Reload, DaemonReload and None. The Reboot action and the None action cannot be used in conjunction with any of the other actions. This list supports a maximum of 10 entries.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.NodeDisruptionPolicyStatusAction" + }, + "x-kubernetes-list-type": "atomic" }, "name": { - "description": "name is required and specifies a unique name for the server. Name must comply with the Service Name Syntax of rfc6335.", + "description": "name represents the service name of a systemd service managed through a MachineConfig Actions specified will be applied for changes to the named service. Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", "type": "string", "default": "" - }, - "zones": { - "description": "zones is required and specifies the subdomains that Server is authoritative for. Zones must conform to the rfc1123 definition of a subdomain. Specifying the cluster domain (i.e., \"cluster.local\") is invalid.", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "Server", + "Kind": "NodeDisruptionPolicyStatusUnit", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceAccountIssuerStatus": { + "io.openshift.operator.v1.NodePlacement": { + "description": "NodePlacement describes node scheduling configuration for an ingress controller.", "type": "object", - "required": [ - "name" - ], "properties": { - "expirationTime": { - "description": "expirationTime is the time after which this service account issuer will be pruned and removed from the trusted list of service account issuers.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "nodeSelector": { + "description": "nodeSelector is the node selector applied to ingress controller deployments.\n\nIf set, the specified selector is used and replaces the default.\n\nIf unset, the default depends on the value of the defaultPlacement field in the cluster config.openshift.io/v1/ingresses status.\n\nWhen defaultPlacement is Workers, the default is:\n\n kubernetes.io/os: linux\n node-role.kubernetes.io/worker: ''\n\nWhen defaultPlacement is ControlPlane, the default is:\n\n kubernetes.io/os: linux\n node-role.kubernetes.io/master: ''\n\nThese defaults are subject to change.\n\nNote that using nodeSelector.matchExpressions is not supported. Only nodeSelector.matchLabels may be used. This is a limitation of the Kubernetes API: the pod spec does not allow complex expressions for node selectors.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" }, - "name": { - "description": "name is the name of the service account issuer", - "type": "string", - "default": "" + "tolerations": { + "description": "tolerations is a list of tolerations applied to ingress controller deployments.\n\nThe default is an empty list.\n\nSee https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.core.v1.Toleration" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceAccountIssuerStatus", + "Kind": "NodePlacement", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCA": { - "description": "ServiceCA provides information to configure an operator to manage the service cert controllers\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.NodePortStrategy": { + "description": "NodePortStrategy holds parameters for the NodePortService endpoint publishing strategy.", "type": "object", - "required": [ - "metadata", - "spec" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "protocol": { + "description": "protocol specifies whether the IngressController expects incoming connections to use plain TCP or whether the IngressController expects PROXY protocol.\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nThe following values are valid for this field:\n\n* The empty string. * \"TCP\". * \"PROXY\".\n\nThe empty string specifies the default, which is TCP without PROXY protocol. Note that the default is subject to change.", "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCASpec" - }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCAStatus" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCA", - "Scope": "Clustered" + "Kind": "NodePortStrategy", + "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCAList": { - "description": "ServiceCAList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.NodeStatus": { + "description": "NodeStatus provides information about the current state of a particular node managed by this operator.", "type": "object", "required": [ - "metadata", - "items" + "nodeName", + "currentRevision" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "currentRevision": { + "description": "currentRevision is the generation of the most recently successful deployment", + "type": "integer", + "format": "int32", + "default": 0 + }, + "lastFailedCount": { + "description": "lastFailedCount is how often the installer pod of the last failed revision failed.", + "type": "integer", + "format": "int32" + }, + "lastFailedReason": { + "description": "lastFailedReason is a machine readable failure reason string.", "type": "string" }, - "items": { - "description": "Items contains the items", + "lastFailedRevision": { + "description": "lastFailedRevision is the generation of the deployment we tried and failed to deploy.", + "type": "integer", + "format": "int32" + }, + "lastFailedRevisionErrors": { + "description": "lastFailedRevisionErrors is a list of human readable errors during the failed deployment referenced in lastFailedRevision.", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCA" - } + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "lastFailedTime": { + "description": "lastFailedTime is the time the last failed revision failed the last time.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "lastFallbackCount": { + "description": "lastFallbackCount is how often a fallback to a previous revision happened.", + "type": "integer", + "format": "int32" + }, + "nodeName": { + "description": "nodeName is the name of the node", + "type": "string", + "default": "" + }, + "targetRevision": { + "description": "targetRevision is the generation of the deployment we're trying to apply", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCAList", + "Kind": "NodeStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCASpec": { + "io.openshift.operator.v1.OAuthAPIServerStatus": { "type": "object", - "required": [ - "managementState" - ], "properties": { - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", - "type": "string", - "default": "" - }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "latestAvailableRevision": { + "description": "LatestAvailableRevision is the latest revision used as suffix of revisioned secrets like encryption-config. A new revision causes a new deployment of pods.", + "type": "integer", + "format": "int32" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCASpec", + "Kind": "OAuthAPIServerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCAStatus": { + "io.openshift.operator.v1.OVNKubernetesConfig": { + "description": "ovnKubernetesConfig contains the configuration parameters for networks using the ovn-kubernetes network project", "type": "object", - "required": [ - "readyReplicas" - ], "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" + "egressIPConfig": { + "description": "egressIPConfig holds the configuration for EgressIP options.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.EgressIPConfig" }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + "gatewayConfig": { + "description": "gatewayConfig holds the configuration for node gateway options.", + "$ref": "#/definitions/io.openshift.operator.v1.GatewayConfig" + }, + "genevePort": { + "description": "geneve port is the UDP port to be used by geneve encapulation. Default is 6081", + "type": "integer", + "format": "int64" + }, + "hybridOverlayConfig": { + "description": "HybridOverlayConfig configures an additional overlay network for peers that are not using OVN.", + "$ref": "#/definitions/io.openshift.operator.v1.HybridOverlayConfig" + }, + "ipsecConfig": { + "description": "ipsecConfig enables and configures IPsec for pods on the pod network within the cluster.", + "default": { + "mode": "Disabled" }, - "x-kubernetes-list-type": "atomic" + "$ref": "#/definitions/io.openshift.operator.v1.IPsecConfig" }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", + "ipv4": { + "description": "ipv4 allows users to configure IP settings for IPv4 connections. When ommitted, this means no opinions and the default configuration is used. Check individual fields within ipv4 for details of default values.", + "$ref": "#/definitions/io.openshift.operator.v1.IPv4OVNKubernetesConfig" + }, + "ipv6": { + "description": "ipv6 allows users to configure IP settings for IPv6 connections. When ommitted, this means no opinions and the default configuration is used. Check individual fields within ipv4 for details of default values.", + "$ref": "#/definitions/io.openshift.operator.v1.IPv6OVNKubernetesConfig" + }, + "mtu": { + "description": "mtu is the MTU to use for the tunnel interface. This must be 100 bytes smaller than the uplink mtu. Default is 1400", "type": "integer", "format": "int64" }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 + "policyAuditConfig": { + "description": "policyAuditConfig is the configuration for network policy audit events. If unset, reported defaults are used.", + "$ref": "#/definitions/io.openshift.operator.v1.PolicyAuditConfig" }, - "version": { - "description": "version is the level this availability applies to", + "routeAdvertisements": { + "description": "routeAdvertisements determines if the functionality to advertise cluster network routes through a dynamic routing protocol, such as BGP, is enabled or not. This functionality is configured through the ovn-kubernetes RouteAdvertisements CRD. Requires the 'FRR' routing capability provider to be enabled as an additional routing capability. Allowed values are \"Enabled\", \"Disabled\" and ommited. When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is \"Disabled\".", + "type": "string" + }, + "v4InternalSubnet": { + "description": "v4InternalSubnet is a v4 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. Default is 100.64.0.0/16", + "type": "string" + }, + "v6InternalSubnet": { + "description": "v6InternalSubnet is a v6 subnet used internally by ovn-kubernetes in case the default one is being already used by something else. It must not overlap with any other subnet being used by OpenShift or by the node network. The size of the subnet must be larger than the number of nodes. The value cannot be changed after installation. Default is fd98::/48", "type": "string" } }, @@ -50455,14 +54160,15 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCAStatus", + "Kind": "OVNKubernetesConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCatalogAPIServer": { - "description": "ServiceCatalogAPIServer provides information to configure an operator to manage Service Catalog API Server DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.OpenShiftAPIServer": { + "description": "OpenShiftAPIServer provides information to configure an operator to manage openshift-apiserver.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "spec" ], "properties": { @@ -50480,24 +54186,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { + "description": "spec is the specification of the desired behavior of the OpenShift API Server.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogAPIServerSpec" + "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftAPIServerSpec" }, "status": { + "description": "status defines the observed status of the OpenShift API Server.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogAPIServerStatus" + "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftAPIServerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogAPIServer", + "Kind": "OpenShiftAPIServer", "Scope": "Clustered" } }, - "io.openshift.operator.v1.ServiceCatalogAPIServerList": { - "description": "ServiceCatalogAPIServerList is a collection of items DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.OpenShiftAPIServerList": { + "description": "OpenShiftAPIServerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -50513,7 +54221,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogAPIServer" + "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftAPIServer" } }, "kind": { @@ -50530,11 +54238,11 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogAPIServerList", + "Kind": "OpenShiftAPIServerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCatalogAPIServerSpec": { + "io.openshift.operator.v1.OpenShiftAPIServerSpec": { "type": "object", "required": [ "managementState" @@ -50568,11 +54276,11 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogAPIServerSpec", + "Kind": "OpenShiftAPIServerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCatalogAPIServerStatus": { + "io.openshift.operator.v1.OpenShiftAPIServerStatus": { "type": "object", "required": [ "readyReplicas" @@ -50597,7 +54305,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -50619,12 +54338,12 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogAPIServerStatus", + "Kind": "OpenShiftAPIServerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCatalogControllerManager": { - "description": "ServiceCatalogControllerManager provides information to configure an operator to manage Service Catalog Controller Manager DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.OpenShiftControllerManager": { + "description": "OpenShiftControllerManager provides information to configure an operator to manage openshift-controller-manager.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -50646,23 +54365,23 @@ }, "spec": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogControllerManagerSpec" + "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftControllerManagerSpec" }, "status": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogControllerManagerStatus" + "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftControllerManagerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogControllerManager", + "Kind": "OpenShiftControllerManager", "Scope": "Clustered" } }, - "io.openshift.operator.v1.ServiceCatalogControllerManagerList": { - "description": "ServiceCatalogControllerManagerList is a collection of items DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.OpenShiftControllerManagerList": { + "description": "OpenShiftControllerManagerList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -50678,7 +54397,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogControllerManager" + "$ref": "#/definitions/io.openshift.operator.v1.OpenShiftControllerManager" } }, "kind": { @@ -50695,11 +54414,11 @@ "Type": "list", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogControllerManagerList", + "Kind": "OpenShiftControllerManagerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCatalogControllerManagerSpec": { + "io.openshift.operator.v1.OpenShiftControllerManagerSpec": { "type": "object", "required": [ "managementState" @@ -50733,11 +54452,11 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogControllerManagerSpec", + "Kind": "OpenShiftControllerManagerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.ServiceCatalogControllerManagerStatus": { + "io.openshift.operator.v1.OpenShiftControllerManagerStatus": { "type": "object", "required": [ "readyReplicas" @@ -50762,7 +54481,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -50784,294 +54514,72 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "ServiceCatalogControllerManagerStatus", + "Kind": "OpenShiftControllerManagerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.SimpleMacvlanConfig": { - "description": "SimpleMacvlanConfig contains configurations for macvlan interface.", + "io.openshift.operator.v1.OpenShiftSDNConfig": { + "description": "OpenShiftSDNConfig was used to configure the OpenShift SDN plugin. It is no longer used.", "type": "object", + "required": [ + "mode" + ], "properties": { - "ipamConfig": { - "description": "IPAMConfig configures IPAM module will be used for IP Address Management (IPAM).", - "$ref": "#/definitions/io.openshift.operator.v1.IPAMConfig" - }, - "master": { - "description": "master is the host interface to create the macvlan interface from. If not specified, it will be default route interface", - "type": "string" + "enableUnidling": { + "description": "enableUnidling controls whether or not the service proxy will support idling and unidling of services. By default, unidling is enabled.", + "type": "boolean" }, "mode": { - "description": "mode is the macvlan mode: bridge, private, vepa, passthru. The default is bridge", - "type": "string" + "description": "mode is one of \"Multitenant\", \"Subnet\", or \"NetworkPolicy\"", + "type": "string", + "default": "" }, "mtu": { - "description": "mtu is the mtu to use for the macvlan interface. if unset, host's kernel will select the value.", + "description": "mtu is the mtu to use for the tunnel interface. Defaults to 1450 if unset. This must be 50 bytes smaller than the machine's uplink.", "type": "integer", "format": "int64" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "SimpleMacvlanConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.StaticIPAMAddresses": { - "description": "StaticIPAMAddresses provides IP address and Gateway for static IPAM addresses", - "type": "object", - "properties": { - "address": { - "description": "Address is the IP address in CIDR format", - "type": "string", - "default": "" - }, - "gateway": { - "description": "Gateway is IP inside of subnet to designate as the gateway", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "StaticIPAMAddresses", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.StaticIPAMConfig": { - "description": "StaticIPAMConfig contains configurations for static IPAM (IP Address Management)", - "type": "object", - "properties": { - "addresses": { - "description": "Addresses configures IP address for the interface", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMAddresses" - }, - "x-kubernetes-list-type": "atomic" - }, - "dns": { - "description": "DNS configures DNS for the interface", - "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMDNS" - }, - "routes": { - "description": "Routes configures IP routes for the interface", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMRoutes" - }, - "x-kubernetes-list-type": "atomic" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "StaticIPAMConfig", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.StaticIPAMDNS": { - "description": "StaticIPAMDNS provides DNS related information for static IPAM", - "type": "object", - "properties": { - "domain": { - "description": "Domain configures the domainname the local domain used for short hostname lookups", - "type": "string" }, - "nameservers": { - "description": "Nameservers points DNS servers for IP lookup", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "useExternalOpenvswitch": { + "description": "useExternalOpenvswitch used to control whether the operator would deploy an OVS DaemonSet itself or expect someone else to start OVS. As of 4.6, OVS is always run as a system service, and this flag is ignored.", + "type": "boolean" }, - "search": { - "description": "Search configures priority ordered search domains for short hostname lookups", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "atomic" + "vxlanPort": { + "description": "vxlanPort is the port to use for all vxlan packets. The default is 4789.", + "type": "integer", + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "StaticIPAMDNS", + "Kind": "OpenShiftSDNConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.StaticIPAMRoutes": { - "description": "StaticIPAMRoutes provides Destination/Gateway pairs for static IPAM routes", + "io.openshift.operator.v1.OperatorCondition": { + "description": "OperatorCondition is just the standard condition fields.", "type": "object", "required": [ - "destination" + "type", + "status" ], "properties": { - "destination": { - "description": "Destination points the IP route destination", - "type": "string", - "default": "" + "lastTransitionTime": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "gateway": { - "description": "Gateway is the route's next-hop IP address If unset, a default gateway is assumed (as determined by the CNI plugin).", + "message": { "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "StaticIPAMRoutes", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.StaticPodOperatorSpec": { - "description": "StaticPodOperatorSpec is spec for controllers that manage static pods.", - "type": "object", - "required": [ - "managementState", - "forceRedeploymentReason" - ], - "properties": { - "failedRevisionLimit": { - "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", - "type": "integer", - "format": "int32" }, - "forceRedeploymentReason": { - "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", - "type": "string", - "default": "" - }, - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "reason": { "type": "string" }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", + "status": { "type": "string", "default": "" }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "succeededRevisionLimit": { - "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", - "type": "integer", - "format": "int32" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "StaticPodOperatorSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.StaticPodOperatorStatus": { - "description": "StaticPodOperatorStatus is status for controllers that manage static pods. There are different needs because individual node status must be tracked.", - "type": "object", - "required": [ - "readyReplicas" - ], - "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" - }, - "latestAvailableRevision": { - "description": "latestAvailableRevision is the deploymentID of the most recent deployment", - "type": "integer", - "format": "int32" - }, - "latestAvailableRevisionReason": { - "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", - "type": "string" - }, - "nodeStatuses": { - "description": "nodeStatuses track the deployment values and errors across individual nodes", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" - }, - "x-kubernetes-list-map-keys": [ - "nodeName" - ], - "x-kubernetes-list-type": "map" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 - }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "StaticPodOperatorStatus", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.StatuspageProvider": { - "description": "StatuspageProvider provides identity for statuspage account.", - "type": "object", - "required": [ - "pageID" - ], - "properties": { - "pageID": { - "description": "pageID is the unique ID assigned by Statuspage for your page. This must be a public page.", + "type": { "type": "string", "default": "" } @@ -51080,87 +54588,12 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "StatuspageProvider", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1.Storage": { - "description": "Storage provides a means to configure an operator to manage the cluster storage operator. `cluster` is the canonical name.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "spec" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.StorageSpec" - }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.StorageStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "Storage", - "Scope": "Clustered" - } - }, - "io.openshift.operator.v1.StorageList": { - "description": "StorageList contains a list of Storages.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.Storage" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "operator.openshift.io", - "Version": "v1", - "Kind": "StorageList", + "Kind": "OperatorCondition", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.StorageSpec": { - "description": "StorageSpec is the specification of the desired behavior of the cluster storage operator.", + "io.openshift.operator.v1.OperatorSpec": { + "description": "OperatorSpec contains common fields operators need. It is intended to be anonymous included inside of the Spec struct for your particular operator.", "type": "object", "required": [ "managementState" @@ -51188,23 +54621,17 @@ "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", "default": {}, "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "vsphereStorageDriver": { - "description": "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. The current default is CSIWithMigrationDriver and may not be changed. DEPRECATED: This field will be removed in a future release.", - "type": "string", - "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "StorageSpec", + "Kind": "OperatorSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.StorageStatus": { - "description": "StorageStatus defines the observed status of the cluster storage operator.", + "io.openshift.operator.v1.OperatorStatus": { "type": "object", "required": [ "readyReplicas" @@ -51229,7 +54656,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -51251,65 +54689,75 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "StorageStatus", + "Kind": "OperatorStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.SyslogLoggingDestinationParameters": { - "description": "SyslogLoggingDestinationParameters describes parameters for the Syslog logging destination type.", + "io.openshift.operator.v1.PartialSelector": { + "description": "PartialSelector provides label selector(s) that can be used to match machine management resources.", + "type": "object", + "properties": { + "machineResourceSelector": { + "description": "machineResourceSelector is a label selector that can be used to select machine resources like MachineSets.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "PartialSelector", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.Perspective": { + "description": "Perspective defines a perspective that cluster admins want to show/hide in the perspective switcher dropdown", "type": "object", "required": [ - "address", - "port" + "id", + "visibility" ], "properties": { - "address": { - "description": "address is the IP address of the syslog endpoint that receives log messages.", + "id": { + "description": "id defines the id of the perspective. Example: \"dev\", \"admin\". The available perspective ids can be found in the code snippet section next to the yaml editor. Incorrect or unknown ids will be ignored.", "type": "string", "default": "" }, - "facility": { - "description": "facility specifies the syslog facility of log messages.\n\nIf this field is empty, the facility is \"local1\".", - "type": "string" - }, - "maxLength": { - "description": "maxLength is the maximum length of the log message.\n\nValid values are integers in the range 480 to 4096, inclusive.\n\nWhen omitted, the default value is 1024.", - "type": "integer", - "format": "int64" + "pinnedResources": { + "description": "pinnedResources defines the list of default pinned resources that users will see on the perspective navigation if they have not customized these pinned resources themselves. The list of available Kubernetes resources could be read via `kubectl api-resources`. The console will also provide a configuration UI and a YAML snippet that will list the available resources that can be pinned to the navigation. Incorrect or unknown resources will be ignored.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.PinnedResourceReference" + } }, - "port": { - "description": "port is the UDP port number of the syslog endpoint that receives log messages.", - "type": "integer", - "format": "int64", - "default": 0 + "visibility": { + "description": "visibility defines the state of perspective along with access review checks if needed for that perspective.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.PerspectiveVisibility" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "SyslogLoggingDestinationParameters", + "Kind": "Perspective", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.Upstream": { - "description": "Upstream can either be of type SystemResolvConf, or of type Network.\n\n - For an Upstream of type SystemResolvConf, no further fields are necessary:\n The upstream will be configured to use /etc/resolv.conf.\n - For an Upstream of type Network, a NetworkResolver field needs to be defined\n with an IP address or IP:port if the upstream listens on a port other than 53.", + "io.openshift.operator.v1.PerspectiveVisibility": { + "description": "PerspectiveVisibility defines the criteria to show/hide a perspective", "type": "object", "required": [ - "type" + "state" ], "properties": { - "address": { - "description": "Address must be defined when Type is set to Network. It will be ignored otherwise. It must be a valid ipv4 or ipv6 address.", - "type": "string" - }, - "port": { - "description": "Port may be defined when Type is set to Network. It will be ignored otherwise. Port must be between 65535", - "type": "integer", - "format": "int64" + "accessReview": { + "description": "accessReview defines required and missing access review checks.", + "$ref": "#/definitions/io.openshift.operator.v1.ResourceAttributesAccessReview" }, - "type": { - "description": "Type defines whether this upstream contains an IP/IP:port resolver or the local /etc/resolv.conf. Type accepts 2 possible values: SystemResolvConf or Network.\n\n* When SystemResolvConf is used, the Upstream structure does not require any further fields to be defined:\n /etc/resolv.conf will be used\n* When Network is used, the Upstream structure must contain at least an Address", + "state": { + "description": "state defines the perspective is enabled or disabled or access review check is required.", "type": "string", "default": "" } @@ -51318,97 +54766,145 @@ "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "Upstream", + "Kind": "PerspectiveVisibility", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "state", + "fields-to-discriminateBy": { + "accessReview": "AccessReview" + } + } + ] }, - "io.openshift.operator.v1.UpstreamResolvers": { - "description": "UpstreamResolvers defines a schema for configuring the CoreDNS forward plugin in the specific case of the default (\".\") server. It defers from ForwardPlugin in the default values it accepts: * At least one upstream should be specified. * the default policy is Sequential", + "io.openshift.operator.v1.PinnedResourceReference": { + "description": "PinnedResourceReference includes the group, version and type of resource", "type": "object", + "required": [ + "group", + "version", + "resource" + ], "properties": { - "policy": { - "description": "Policy is used to determine the order in which upstream servers are selected for querying. Any one of the following values may be specified:\n\n* \"Random\" picks a random upstream server for each query. * \"RoundRobin\" picks upstream servers in a round-robin order, moving to the next server for each new query. * \"Sequential\" tries querying upstream servers in a sequential order until one responds, starting with the first server for each new query.\n\nThe default value is \"Sequential\"", - "type": "string" - }, - "protocolStrategy": { - "description": "protocolStrategy specifies the protocol to use for upstream DNS requests. Valid values for protocolStrategy are \"TCP\" and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is to use the protocol of the original client request. \"TCP\" specifies that the platform should use TCP for all upstream DNS requests, even if the client request uses UDP. \"TCP\" is useful for UDP-specific issues such as those created by non-compliant upstream resolvers, but may consume more bandwidth or increase DNS response time. Note that protocolStrategy only affects the protocol of DNS requests that CoreDNS makes to upstream resolvers. It does not affect the protocol of DNS requests between clients and CoreDNS.", + "group": { + "description": "group is the API Group of the Resource. Enter empty string for the core group. This value should consist of only lowercase alphanumeric characters, hyphens and periods. Example: \"\", \"apps\", \"build.openshift.io\", etc.", "type": "string", "default": "" }, - "transportConfig": { - "description": "transportConfig is used to configure the transport type, server name, and optional custom CA or CA bundle to use when forwarding DNS requests to an upstream resolver.\n\nThe default value is \"\" (empty) which results in a standard cleartext connection being used when forwarding DNS requests to an upstream resolver.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.DNSTransportConfig" + "resource": { + "description": "resource is the type that is being referenced. It is normally the plural form of the resource kind in lowercase. This value should consist of only lowercase alphanumeric characters and hyphens. Example: \"deployments\", \"deploymentconfigs\", \"pods\", etc.", + "type": "string", + "default": "" }, - "upstreams": { - "description": "Upstreams is a list of resolvers to forward name queries for the \".\" domain. Each instance of CoreDNS performs health checking of Upstreams. When a healthy upstream returns an error during the exchange, another resolver is tried from Upstreams. The Upstreams are selected in the order specified in Policy.\n\nA maximum of 15 upstreams is allowed per ForwardPlugin. If no Upstreams are specified, /etc/resolv.conf is used by default", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.Upstream" - } + "version": { + "description": "version is the API Version of the Resource. This value should consist of only lowercase alphanumeric characters. Example: \"v1\", \"v1beta1\", etc.", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "UpstreamResolvers", + "Kind": "PinnedResourceReference", "Scope": "Namespaced" } }, - "io.openshift.operator.v1.VSphereCSIDriverConfigSpec": { - "description": "VSphereCSIDriverConfigSpec defines properties that can be configured for vsphere CSI driver.", + "io.openshift.operator.v1.PolicyAuditConfig": { "type": "object", "properties": { - "globalMaxSnapshotsPerBlockVolume": { - "description": "globalMaxSnapshotsPerBlockVolume is a global configuration parameter that applies to volumes on all kinds of datastores. If omitted, the platform chooses a default, which is subject to change over time, currently that default is 3. Snapshots can not be disabled using this parameter. Increasing number of snapshots above 3 can have negative impact on performance, for more details see: https://kb.vmware.com/s/article/1025279 Volume snapshot documentation: https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-E0B41C69-7EEB-450F-A73D-5FD2FF39E891.html", + "destination": { + "description": "destination is the location for policy log messages. Regardless of this config, persistent logs will always be dumped to the host at /var/log/ovn/ however Additionally syslog output may be configured as follows. Valid values are: - \"libc\" -\u003e to use the libc syslog() function of the host node's journdald process - \"udp:host:port\" -\u003e for sending syslog over UDP - \"unix:file\" -\u003e for using the UNIX domain socket directly - \"null\" -\u003e to discard all messages logged to syslog The default is \"null\"", + "type": "string" + }, + "maxFileSize": { + "description": "maxFilesSize is the max size an ACL_audit log file is allowed to reach before rotation occurs Units are in MB and the Default is 50MB", "type": "integer", "format": "int64" }, - "granularMaxSnapshotsPerBlockVolumeInVSAN": { - "description": "granularMaxSnapshotsPerBlockVolumeInVSAN is a granular configuration parameter on vSAN datastore only. It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset. Snapshots for VSAN can not be disabled using this parameter.", + "maxLogFiles": { + "description": "maxLogFiles specifies the maximum number of ACL_audit log files that can be present.", "type": "integer", - "format": "int64" + "format": "int32" }, - "granularMaxSnapshotsPerBlockVolumeInVVOL": { - "description": "granularMaxSnapshotsPerBlockVolumeInVVOL is a granular configuration parameter on Virtual Volumes datastore only. It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset. Snapshots for VVOL can not be disabled using this parameter.", + "rateLimit": { + "description": "rateLimit is the approximate maximum number of messages to generate per-second per-node. If unset the default of 20 msg/sec is used.", "type": "integer", "format": "int64" }, - "topologyCategories": { - "description": "topologyCategories indicates tag categories with which vcenter resources such as hostcluster or datacenter were tagged with. If cluster Infrastructure object has a topology, values specified in Infrastructure object will be used and modifications to topologyCategories will be rejected.", + "syslogFacility": { + "description": "syslogFacility the RFC5424 facility for generated messages, e.g. \"kern\". Default is \"local0\"", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "PolicyAuditConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.PrivateStrategy": { + "description": "PrivateStrategy holds parameters for the Private endpoint publishing strategy.", + "type": "object", + "properties": { + "protocol": { + "description": "protocol specifies whether the IngressController expects incoming connections to use plain TCP or whether the IngressController expects PROXY protocol.\n\nPROXY protocol can be used with load balancers that support it to communicate the source addresses of client connections when forwarding those connections to the IngressController. Using PROXY protocol enables the IngressController to report those source addresses instead of reporting the load balancer's address in HTTP headers and logs. Note that enabling PROXY protocol on the IngressController will cause connections to fail if you are not using a load balancer that uses PROXY protocol to forward connections to the IngressController. See http://www.haproxy.org/download/2.2/doc/proxy-protocol.txt for information about PROXY protocol.\n\nThe following values are valid for this field:\n\n* The empty string. * \"TCP\". * \"PROXY\".\n\nThe empty string specifies the default, which is TCP without PROXY protocol. Note that the default is subject to change.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "PrivateStrategy", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.ProjectAccess": { + "description": "ProjectAccess contains options for project access roles", + "type": "object", + "properties": { + "availableClusterRoles": { + "description": "availableClusterRoles is the list of ClusterRole names that are assignable to users through the project access tab.", "type": "array", "items": { "type": "string", "default": "" - }, - "x-kubernetes-list-type": "atomic" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", "Version": "v1", - "Kind": "VSphereCSIDriverConfigSpec", + "Kind": "ProjectAccess", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.BackupJobReference": { - "description": "BackupJobReference holds a reference to the batch/v1 Job created to run the etcd backup", + "io.openshift.operator.v1.ProviderLoadBalancerParameters": { + "description": "ProviderLoadBalancerParameters holds desired load balancer information specific to the underlying infrastructure provider.", "type": "object", "required": [ - "namespace", - "name" + "type" ], "properties": { - "name": { - "description": "name is the name of the Job. Required", - "type": "string", - "default": "" + "aws": { + "description": "aws provides configuration settings that are specific to AWS load balancers.\n\nIf empty, defaults will be applied. See specific aws fields for details about their defaults.", + "$ref": "#/definitions/io.openshift.operator.v1.AWSLoadBalancerParameters" }, - "namespace": { - "description": "namespace is the namespace of the Job. this is always expected to be \"openshift-etcd\" since the user provided PVC is also required to be in \"openshift-etcd\" Required", + "gcp": { + "description": "gcp provides configuration settings that are specific to GCP load balancers.\n\nIf empty, defaults will be applied. See specific gcp fields for details about their defaults.", + "$ref": "#/definitions/io.openshift.operator.v1.GCPLoadBalancerParameters" + }, + "ibm": { + "description": "ibm provides configuration settings that are specific to IBM Cloud load balancers.\n\nIf empty, defaults will be applied. See specific ibm fields for details about their defaults.", + "$ref": "#/definitions/io.openshift.operator.v1.IBMLoadBalancerParameters" + }, + "type": { + "description": "type is the underlying infrastructure provider for the load balancer. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"IBM\", \"Nutanix\", \"OpenStack\", and \"VSphere\".", "type": "string", "default": "" } @@ -51416,124 +54912,133 @@ "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "BackupJobReference", + "Version": "v1", + "Kind": "ProviderLoadBalancerParameters", "Scope": "Namespaced" - } + }, + "x-kubernetes-unions": [ + { + "discriminator": "type", + "fields-to-discriminateBy": { + "aws": "AWS", + "gcp": "GCP", + "ibm": "IBM" + } + } + ] }, - "io.openshift.operator.v1alpha1.DelegatedAuthentication": { - "description": "DelegatedAuthentication allows authentication to be disabled.", + "io.openshift.operator.v1.ProxyConfig": { + "description": "ProxyConfig defines the configuration knobs for kubeproxy All of these are optional and have sensible defaults", "type": "object", "properties": { - "disabled": { - "description": "disabled indicates that authentication should be disabled. By default it will use delegated authentication.", - "type": "boolean" + "bindAddress": { + "description": "The address to \"bind\" on Defaults to 0.0.0.0", + "type": "string" + }, + "iptablesSyncPeriod": { + "description": "An internal kube-proxy parameter. In older releases of OCP, this sometimes needed to be adjusted in large clusters for performance reasons, but this is no longer necessary, and there is no reason to change this from the default value. Default: 30s", + "type": "string" + }, + "proxyArguments": { + "description": "Any additional arguments to pass to the kubeproxy process", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "DelegatedAuthentication", + "Version": "v1", + "Kind": "ProxyConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.DelegatedAuthorization": { - "description": "DelegatedAuthorization allows authorization to be disabled.", + "io.openshift.operator.v1.QuickStarts": { + "description": "QuickStarts allow cluster admins to customize available ConsoleQuickStart resources.", "type": "object", "properties": { "disabled": { - "description": "disabled indicates that authorization should be disabled. By default it will use delegated authorization.", - "type": "boolean" + "description": "disabled is a list of ConsoleQuickStart resource names that are not shown to users.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "DelegatedAuthorization", + "Version": "v1", + "Kind": "QuickStarts", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.EtcdBackup": { - "description": "# EtcdBackup provides configuration options and status for a one-time backup attempt of the etcd cluster\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ReloadService": { + "description": "ReloadService allows the user to specify the services to be reloaded", "type": "object", "required": [ - "spec" + "serviceName" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "spec holds user settable values for configuration", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.EtcdBackupSpec" - }, - "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.EtcdBackupStatus" + "serviceName": { + "description": "serviceName is the full name (e.g. crio.service) of the service to be reloaded Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "EtcdBackup", - "Scope": "Clustered" + "Version": "v1", + "Kind": "ReloadService", + "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.EtcdBackupList": { - "description": "EtcdBackupList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ResourceAttributesAccessReview": { + "description": "ResourceAttributesAccessReview defines the visibility of the perspective depending on the access review checks. `required` and `missing` can work together esp. in the case where the cluster admin wants to show another perspective to users without specific permissions. Out of `required` and `missing` atleast one property should be non-empty.", "type": "object", - "required": [ - "metadata", - "items" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { + "missing": { + "description": "missing defines a list of permission checks. The perspective will only be shown when at least one check fails. When omitted, the access review is skipped and the perspective will not be shown unless it is required to do so based on the configuration of the required access review list.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.EtcdBackup" + "$ref": "#/definitions/io.k8s.api.authorization.v1.ResourceAttributes" } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" + "required": { + "description": "required defines a list of permission checks. The perspective will only be shown when all checks are successful. When omitted, the access review is skipped and the perspective will not be shown unless it is required to do so based on the configuration of the missing access review list.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.api.authorization.v1.ResourceAttributes" + } } }, "x-fabric8-info": { - "Type": "list", + "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "EtcdBackupList", + "Version": "v1", + "Kind": "ResourceAttributesAccessReview", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.EtcdBackupSpec": { + "io.openshift.operator.v1.RestartService": { + "description": "RestartService allows the user to specify the services to be restarted", "type": "object", + "required": [ + "serviceName" + ], "properties": { - "pvcName": { - "description": "PVCName specifies the name of the PersistentVolumeClaim (PVC) which binds a PersistentVolume where the etcd backup file would be saved The PVC itself must always be created in the \"openshift-etcd\" namespace If the PVC is left unspecified \"\" then the platform will choose a reasonable default location to save the backup. In the future this would be backups saved across the control-plane master nodes.", + "serviceName": { + "description": "serviceName is the full name (e.g. crio.service) of the service to be restarted Service names should be of the format ${NAME}${SERVICETYPE} and can up to 255 characters long. ${NAME} must be atleast 1 character long and can only consist of alphabets, digits, \":\", \"-\", \"_\", \".\", and \"\". ${SERVICETYPE} must be one of \".service\", \".socket\", \".device\", \".mount\", \".automount\", \".swap\", \".target\", \".path\", \".timer\", \".snapshot\", \".slice\" or \".scope\".", "type": "string", "default": "" } @@ -51541,135 +55046,118 @@ "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "EtcdBackupSpec", + "Version": "v1", + "Kind": "RestartService", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.EtcdBackupStatus": { + "io.openshift.operator.v1.RouteAdmissionPolicy": { + "description": "RouteAdmissionPolicy is an admission policy for allowing new route claims.", "type": "object", - "required": [ - "backupJob" - ], "properties": { - "backupJob": { - "description": "backupJob is the reference to the Job that executes the backup. Optional", - "$ref": "#/definitions/io.openshift.operator.v1alpha1.BackupJobReference" + "namespaceOwnership": { + "description": "namespaceOwnership describes how host name claims across namespaces should be handled.\n\nValue must be one of:\n\n- Strict: Do not allow routes in different namespaces to claim the same host.\n\n- InterNamespaceAllowed: Allow routes to claim different paths of the same\n host name across namespaces.\n\nIf empty, the default is Strict.", + "type": "string" }, - "conditions": { - "description": "conditions provide details on the status of the etcd backup job.", + "wildcardPolicy": { + "description": "wildcardPolicy describes how routes with wildcard policies should be handled for the ingress controller. WildcardPolicy controls use of routes [1] exposed by the ingress controller based on the route's wildcard policy.\n\n[1] https://github.com/openshift/api/blob/master/route/v1/types.go\n\nNote: Updating WildcardPolicy from WildcardsAllowed to WildcardsDisallowed will cause admitted routes with a wildcard policy of Subdomain to stop working. These routes must be updated to a wildcard policy of None to be readmitted by the ingress controller.\n\nWildcardPolicy supports WildcardsAllowed and WildcardsDisallowed values.\n\nIf empty, defaults to \"WildcardsDisallowed\".", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "RouteAdmissionPolicy", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.SFlowConfig": { + "type": "object", + "properties": { + "collectors": { + "description": "sFlowCollectors is list of strings formatted as ip:port with a maximum of ten items", "type": "array", "items": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + "type": "string", + "default": "" }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "EtcdBackupStatus", + "Version": "v1", + "Kind": "SFlowConfig", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.GenerationHistory": { - "description": "GenerationHistory keeps track of the generation for a given resource so that decisions about forced updated can be made. DEPRECATED: Use fields in v1.GenerationStatus instead", + "io.openshift.operator.v1.Server": { + "description": "Server defines the schema for a server that runs per instance of CoreDNS.", "type": "object", "required": [ - "group", - "resource", - "namespace", "name", - "lastGeneration" + "zones", + "forwardPlugin" ], "properties": { - "group": { - "description": "group is the group of the thing you're tracking", - "type": "string", - "default": "" - }, - "lastGeneration": { - "description": "lastGeneration is the last generation of the workload controller involved", - "type": "integer", - "format": "int64", - "default": 0 + "forwardPlugin": { + "description": "forwardPlugin defines a schema for configuring CoreDNS to proxy DNS messages to upstream resolvers.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ForwardPlugin" }, "name": { - "description": "name is the name of the thing you're tracking", - "type": "string", - "default": "" - }, - "namespace": { - "description": "namespace is where the thing you're tracking is", + "description": "name is required and specifies a unique name for the server. Name must comply with the Service Name Syntax of rfc6335.", "type": "string", "default": "" }, - "resource": { - "description": "resource is the resource type of the thing you're tracking", - "type": "string", - "default": "" + "zones": { + "description": "zones is required and specifies the subdomains that Server is authoritative for. Zones must conform to the rfc1123 definition of a subdomain. Specifying the cluster domain (i.e., \"cluster.local\") is invalid.", + "type": "array", + "items": { + "type": "string", + "default": "" + } } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "GenerationHistory", + "Version": "v1", + "Kind": "Server", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.GenericOperatorConfig": { - "description": "GenericOperatorConfig provides information to configure an operator\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ServiceAccountIssuerStatus": { "type": "object", + "required": [ + "name" + ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "authentication": { - "description": "authentication allows configuration of authentication for the endpoints", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.DelegatedAuthentication" - }, - "authorization": { - "description": "authorization allows configuration of authentication for the endpoints", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.DelegatedAuthorization" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "leaderElection": { - "description": "leaderElection provides information to elect a leader. Only override this if you have a specific need", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.LeaderElection" + "expirationTime": { + "description": "expirationTime is the time after which this service account issuer will be pruned and removed from the trusted list of service account issuers.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "servingInfo": { - "description": "ServingInfo is the HTTP serving information for the controller's endpoints", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + "name": { + "description": "name is the name of the service account issuer", + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", + "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "GenericOperatorConfig", + "Version": "v1", + "Kind": "ServiceAccountIssuerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.ImageContentSourcePolicy": { - "description": "ImageContentSourcePolicy holds cluster-wide information about how to handle registry mirror rules. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ServiceCA": { + "description": "ServiceCA provides information to configure an operator to manage the service cert controllers\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ + "metadata", "spec" ], "properties": { @@ -51689,19 +55177,24 @@ "spec": { "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.ImageContentSourcePolicySpec" + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCASpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCAStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "ImageContentSourcePolicy", + "Version": "v1", + "Kind": "ServiceCA", "Scope": "Clustered" } }, - "io.openshift.operator.v1alpha1.ImageContentSourcePolicyList": { - "description": "ImageContentSourcePolicyList lists the items in the ImageContentSourcePolicy CRD.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ServiceCAList": { + "description": "ServiceCAList is a collection of items\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -51713,10 +55206,11 @@ "type": "string" }, "items": { + "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.ImageContentSourcePolicy" + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCA" } }, "kind": { @@ -51732,116 +55226,115 @@ "x-fabric8-info": { "Type": "list", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "ImageContentSourcePolicyList", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1alpha1.ImageContentSourcePolicySpec": { - "description": "ImageContentSourcePolicySpec is the specification of the ImageContentSourcePolicy CRD.", - "type": "object", - "properties": { - "repositoryDigestMirrors": { - "description": "repositoryDigestMirrors allows images referenced by image digests in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in RepositoryDigestMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. Only image pull specifications that have an image digest will have this behavior applied to them - tags will continue to be pulled from the specified repository in the pull spec.\n\nEach “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.RepositoryDigestMirrors" - } - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "ImageContentSourcePolicySpec", + "Version": "v1", + "Kind": "ServiceCAList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.LoggingConfig": { - "description": "LoggingConfig holds information about configuring logging DEPRECATED: Use v1.LogLevel instead", + "io.openshift.operator.v1.ServiceCASpec": { "type": "object", "required": [ - "level", - "vmodule" + "managementState" ], "properties": { - "level": { - "description": "level is passed to glog.", - "type": "integer", - "format": "int64", - "default": 0 + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "vmodule": { - "description": "vmodule is passed to glog.", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" + }, + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "LoggingConfig", + "Version": "v1", + "Kind": "ServiceCASpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.NodeStatus": { - "description": "NodeStatus provides information about the current state of a particular node managed by this operator. Deprecated: Use v1.NodeStatus instead", + "io.openshift.operator.v1.ServiceCAStatus": { "type": "object", "required": [ - "nodeName", - "currentDeploymentGeneration", - "targetDeploymentGeneration", - "lastFailedDeploymentGeneration", - "lastFailedDeploymentErrors" + "readyReplicas" ], "properties": { - "currentDeploymentGeneration": { - "description": "currentDeploymentGeneration is the generation of the most recently successful deployment", - "type": "integer", - "format": "int32", - "default": 0 + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "lastFailedDeploymentErrors": { - "description": "lastFailedDeploymentGenerationErrors is a list of the errors during the failed deployment referenced in lastFailedDeploymentGeneration", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", "items": { - "type": "string", - "default": "" - } + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, - "lastFailedDeploymentGeneration": { - "description": "lastFailedDeploymentGeneration is the generation of the deployment we tried and failed to deploy.", + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", "type": "integer", - "format": "int32", - "default": 0 + "format": "int32" }, - "nodeName": { - "description": "nodeName is the name of the node", - "type": "string", - "default": "" + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" }, - "targetDeploymentGeneration": { - "description": "targetDeploymentGeneration is the generation of the deployment we're trying to apply", + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", "type": "integer", "format": "int32", "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "NodeStatus", + "Version": "v1", + "Kind": "ServiceCAStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.OLM": { - "description": "OLM provides information to configure an operator to manage the OLM controllers\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ServiceCatalogAPIServer": { + "description": "ServiceCatalogAPIServer provides information to configure an operator to manage Service Catalog API Server DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "metadata", "spec" ], "properties": { @@ -51859,26 +55352,24 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.OLMSpec" + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogAPIServerSpec" }, "status": { - "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.OLMStatus" + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogAPIServerStatus" } }, "x-fabric8-info": { "Type": "object", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OLM", + "Version": "v1", + "Kind": "ServiceCatalogAPIServer", "Scope": "Clustered" } }, - "io.openshift.operator.v1alpha1.OLMList": { - "description": "OLMList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.ServiceCatalogAPIServerList": { + "description": "ServiceCatalogAPIServerList is a collection of items DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "metadata", @@ -51894,7 +55385,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.OLM" + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogAPIServer" } }, "kind": { @@ -51910,12 +55401,12 @@ "x-fabric8-info": { "Type": "list", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OLMList", + "Version": "v1", + "Kind": "ServiceCatalogAPIServerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.OLMSpec": { + "io.openshift.operator.v1.ServiceCatalogAPIServerSpec": { "type": "object", "required": [ "managementState" @@ -51948,12 +55439,12 @@ "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OLMSpec", + "Version": "v1", + "Kind": "ServiceCatalogAPIServerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.OLMStatus": { + "io.openshift.operator.v1.ServiceCatalogAPIServerStatus": { "type": "object", "required": [ "readyReplicas" @@ -51978,7 +55469,18 @@ "default": {}, "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" }, - "x-kubernetes-list-type": "atomic" + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", @@ -51999,167 +55501,129 @@ "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OLMStatus", + "Version": "v1", + "Kind": "ServiceCatalogAPIServerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.OperatorCondition": { - "description": "OperatorCondition is just the standard condition fields. DEPRECATED: Use v1.OperatorCondition instead", + "io.openshift.operator.v1.ServiceCatalogControllerManager": { + "description": "ServiceCatalogControllerManager provides information to configure an operator to manage Service Catalog Controller Manager DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "type", - "status" + "metadata", + "spec" ], "properties": { - "lastTransitionTime": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "reason": { + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "status": { - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "type": { - "type": "string", - "default": "" + "spec": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogControllerManagerSpec" + }, + "status": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogControllerManagerStatus" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OperatorCondition", - "Scope": "Namespaced" + "Version": "v1", + "Kind": "ServiceCatalogControllerManager", + "Scope": "Clustered" } }, - "io.openshift.operator.v1alpha1.OperatorSpec": { - "description": "OperatorSpec contains common fields for an operator to need. It is intended to be anonymous included inside of the Spec struct for you particular operator. DEPRECATED: Use v1.OperatorSpec instead", + "io.openshift.operator.v1.ServiceCatalogControllerManagerList": { + "description": "ServiceCatalogControllerManagerList is a collection of items DEPRECATED: will be removed in 4.6\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ - "managementState", - "imagePullSpec", - "imagePullPolicy", - "version" + "metadata", + "items" ], "properties": { - "imagePullPolicy": { - "description": "imagePullPolicy specifies the image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.", - "type": "string", - "default": "" - }, - "imagePullSpec": { - "description": "imagePullSpec is the image to use for the component.", - "type": "string", - "default": "" - }, - "logging": { - "description": "logging contains glog parameters for the component pods. It's always a command line arg for the moment", - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.LoggingConfig" - }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", - "type": "string", - "default": "" + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "version": { - "description": "version is the desired state in major.minor.micro-patch. Usually patch is ignored.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OperatorSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.operator.v1alpha1.OperatorStatus": { - "description": "OperatorStatus contains common fields for an operator to need. It is intended to be anonymous included inside of the Status struct for you particular operator. DEPRECATED: Use v1.OperatorStatus instead", - "type": "object", - "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", + "items": { + "description": "Items contains the items", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.OperatorCondition" + "$ref": "#/definitions/io.openshift.operator.v1.ServiceCatalogControllerManager" } }, - "currentVersionAvailability": { - "description": "currentVersionAvailability is availability information for the current version. If it is unmanged or removed, this doesn't exist.", - "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "state": { - "description": "state indicates what the operator has observed to be its current operational status.", + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "targetVersionAvailability": { - "description": "targetVersionAvailability is availability information for the target version if we are migrating", - "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" - }, - "taskSummary": { - "description": "taskSummary is a high level summary of what the controller is currently attempting to do. It is high-level, human-readable and not guaranteed in any way. (I needed this for debugging and realized it made a great summary).", - "type": "string" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "nested", + "Type": "list", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OperatorStatus", + "Version": "v1", + "Kind": "ServiceCatalogControllerManagerList", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.RepositoryDigestMirrors": { - "description": "RepositoryDigestMirrors holds cluster-wide information about how to handle mirros in the registries config. Note: the mirrors only work when pulling the images that are referenced by their digests.", + "io.openshift.operator.v1.ServiceCatalogControllerManagerSpec": { "type": "object", "required": [ - "source" + "managementState" ], "properties": { - "mirrors": { - "description": "mirrors is one or more repositories that may also contain the same images. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. Other cluster configuration, including (but not limited to) other repositoryDigestMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "source": { - "description": "source is the repository that users refer to, e.g. in image pull specifications.", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" + }, + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "RepositoryDigestMirrors", + "Version": "v1", + "Kind": "ServiceCatalogControllerManagerSpec", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.StaticPodOperatorStatus": { - "description": "StaticPodOperatorStatus is status for controllers that manage static pods. There are different needs because individual node status must be tracked. DEPRECATED: Use v1.StaticPodOperatorStatus instead", + "io.openshift.operator.v1.ServiceCatalogControllerManagerStatus": { "type": "object", "required": [ - "latestAvailableDeploymentGeneration", - "nodeStatuses" + "readyReplicas" ], "properties": { "conditions": { @@ -52167,393 +55631,364 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.OperatorCondition" - } - }, - "currentVersionAvailability": { - "description": "currentVersionAvailability is availability information for the current version. If it is unmanged or removed, this doesn't exist.", - "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" - }, - "latestAvailableDeploymentGeneration": { - "description": "latestAvailableDeploymentGeneration is the deploymentID of the most recent deployment", - "type": "integer", - "format": "int32", - "default": 0 + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "nodeStatuses": { - "description": "nodeStatuses track the deployment values and errors across individual nodes", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.NodeStatus" - } + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, "observedGeneration": { "description": "observedGeneration is the last generation change you've dealt with", "type": "integer", "format": "int64" }, - "state": { - "description": "state indicates what the operator has observed to be its current operational status.", - "type": "string" - }, - "targetVersionAvailability": { - "description": "targetVersionAvailability is availability information for the target version if we are migrating", - "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 }, - "taskSummary": { - "description": "taskSummary is a high level summary of what the controller is currently attempting to do. It is high-level, human-readable and not guaranteed in any way. (I needed this for debugging and realized it made a great summary).", + "version": { + "description": "version is the level this availability applies to", "type": "string" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "StaticPodOperatorStatus", + "Version": "v1", + "Kind": "ServiceCatalogControllerManagerStatus", "Scope": "Namespaced" } }, - "io.openshift.operator.v1alpha1.VersionAvailability": { - "description": "VersionAvailability gives information about the synchronization and operational status of a particular version of the component DEPRECATED: Use fields in v1.OperatorStatus instead", + "io.openshift.operator.v1.SimpleMacvlanConfig": { + "description": "SimpleMacvlanConfig contains configurations for macvlan interface.", "type": "object", - "required": [ - "version", - "updatedReplicas", - "readyReplicas", - "errors", - "generations" - ], "properties": { - "errors": { - "description": "errors indicates what failures are associated with the operator trying to manage this version", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "ipamConfig": { + "description": "IPAMConfig configures IPAM module will be used for IP Address Management (IPAM).", + "$ref": "#/definitions/io.openshift.operator.v1.IPAMConfig" }, - "generations": { - "description": "generations allows an operator to track what the generation of \"important\" resources was the last time we updated them", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1alpha1.GenerationHistory" - } + "master": { + "description": "master is the host interface to create the macvlan interface from. If not specified, it will be default route interface", + "type": "string" }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 + "mode": { + "description": "mode is the macvlan mode: bridge, private, vepa, passthru. The default is bridge", + "type": "string" }, - "updatedReplicas": { - "description": "updatedReplicas indicates how many replicas are at the desired state", + "mtu": { + "description": "mtu is the mtu to use for the macvlan interface. if unset, host's kernel will select the value.", "type": "integer", - "format": "int32", - "default": 0 - }, - "version": { - "description": "version is the level this availability applies to", - "type": "string", - "default": "" + "format": "int64" } }, "x-fabric8-info": { "Type": "nested", "Group": "operator.openshift.io", - "Version": "v1alpha1", - "Kind": "VersionAvailability", + "Version": "v1", + "Kind": "SimpleMacvlanConfig", "Scope": "Namespaced" } }, - "io.openshift.operatorcontrolplane.v1alpha1.LogEntry": { - "description": "LogEntry records events", + "io.openshift.operator.v1.StaticIPAMAddresses": { + "description": "StaticIPAMAddresses provides IP address and Gateway for static IPAM addresses", "type": "object", - "required": [ - "time", - "success" - ], "properties": { - "latency": { - "description": "Latency records how long the action mentioned in the entry took.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" - }, - "message": { - "description": "Message explaining status in a human readable format.", - "type": "string" - }, - "reason": { - "description": "Reason for status in a machine readable format.", - "type": "string" - }, - "success": { - "description": "Success indicates if the log entry indicates a success or failure.", - "type": "boolean", - "default": false + "address": { + "description": "Address is the IP address in CIDR format", + "type": "string", + "default": "" }, - "time": { - "description": "Start time of check action.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "gateway": { + "description": "Gateway is IP inside of subnet to designate as the gateway", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "LogEntry", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StaticIPAMAddresses", "Scope": "Namespaced" } }, - "io.openshift.operatorcontrolplane.v1alpha1.OutageEntry": { - "description": "OutageEntry records time period of an outage", + "io.openshift.operator.v1.StaticIPAMConfig": { + "description": "StaticIPAMConfig contains configurations for static IPAM (IP Address Management)", "type": "object", - "required": [ - "start" - ], "properties": { - "end": { - "description": "End of outage detected", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "endLogs": { - "description": "EndLogs contains log entries related to the end of this outage. Should contain the success entry that resolved the outage and possibly a few of the failure log entries that preceded it.", + "addresses": { + "description": "Addresses configures IP address for the interface", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.LogEntry" - } - }, - "message": { - "description": "Message summarizes outage details in a human readable format.", - "type": "string" + "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMAddresses" + }, + "x-kubernetes-list-type": "atomic" }, - "start": { - "description": "Start of outage detected", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "dns": { + "description": "DNS configures DNS for the interface", + "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMDNS" }, - "startLogs": { - "description": "StartLogs contains log entries related to the start of this outage. Should contain the original failure, any entries where the failure mode changed.", + "routes": { + "description": "Routes configures IP routes for the interface", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.LogEntry" - } + "$ref": "#/definitions/io.openshift.operator.v1.StaticIPAMRoutes" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { "Type": "nested", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "OutageEntry", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StaticIPAMConfig", "Scope": "Namespaced" } }, - "io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheck": { - "description": "PodNetworkConnectivityCheck\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.StaticIPAMDNS": { + "description": "StaticIPAMDNS provides DNS related information for static IPAM", "type": "object", - "required": [ - "metadata", - "spec" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "domain": { + "description": "Domain configures the domainname the local domain used for short hostname lookups", "type": "string" }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "description": "Spec defines the source and target of the connectivity check", - "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckSpec" + "nameservers": { + "description": "Nameservers points DNS servers for IP lookup", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" }, - "status": { - "description": "Status contains the observed status of the connectivity check", - "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckStatus" + "search": { + "description": "Search configures priority ordered search domains for short hostname lookups", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { - "Type": "object", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "PodNetworkConnectivityCheck", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StaticIPAMDNS", "Scope": "Namespaced" } }, - "io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckCondition": { - "description": "PodNetworkConnectivityCheckCondition represents the overall status of the pod network connectivity.", + "io.openshift.operator.v1.StaticIPAMRoutes": { + "description": "StaticIPAMRoutes provides Destination/Gateway pairs for static IPAM routes", "type": "object", "required": [ - "type", - "status", - "lastTransitionTime" + "destination" ], "properties": { - "lastTransitionTime": { - "description": "Last time the condition transitioned from one status to another.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { - "description": "Message indicating details about last transition in a human readable format.", - "type": "string" - }, - "reason": { - "description": "Reason for the condition's last status transition in a machine readable format.", - "type": "string" - }, - "status": { - "description": "Status of the condition", + "destination": { + "description": "Destination points the IP route destination", "type": "string", "default": "" }, - "type": { - "description": "Type of the condition", - "type": "string", - "default": "" + "gateway": { + "description": "Gateway is the route's next-hop IP address If unset, a default gateway is assumed (as determined by the CNI plugin).", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "PodNetworkConnectivityCheckCondition", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StaticIPAMRoutes", "Scope": "Namespaced" } }, - "io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckList": { - "description": "PodNetworkConnectivityCheckList is a collection of PodNetworkConnectivityCheck\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.StaticPodOperatorSpec": { + "description": "StaticPodOperatorSpec is spec for controllers that manage static pods.", "type": "object", "required": [ - "metadata", - "items" + "managementState", + "forceRedeploymentReason" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "failedRevisionLimit": { + "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "type": "integer", + "format": "int32" }, - "items": { - "description": "Items contains the items", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheck" - } + "forceRedeploymentReason": { + "description": "forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", + "type": "string", + "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", "type": "string" }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "PodNetworkConnectivityCheckList", - "Scope": "Namespaced" - } - }, - "io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckSpec": { - "type": "object", - "required": [ - "sourcePod", - "targetEndpoint" - ], - "properties": { - "sourcePod": { - "description": "SourcePod names the pod from which the condition will be checked", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" }, - "targetEndpoint": { - "description": "EndpointAddress to check. A TCP address of the form host:port. Note that if host is a DNS name, then the check would fail if the DNS name cannot be resolved. Specify an IP address for host to bypass DNS name lookup.", - "type": "string", - "default": "" + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "tlsClientCert": { - "description": "TLSClientCert, if specified, references a kubernetes.io/tls type secret with 'tls.crt' and 'tls.key' entries containing an optional TLS client certificate and key to be used when checking endpoints that require a client certificate in order to gracefully preform the scan without causing excessive logging in the endpoint process. The secret must exist in the same namespace as this resource.", + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "succeededRevisionLimit": { + "description": "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + "type": "integer", + "format": "int32" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.SecretNameReference" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "PodNetworkConnectivityCheckSpec", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StaticPodOperatorSpec", "Scope": "Namespaced" } }, - "io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckStatus": { + "io.openshift.operator.v1.StaticPodOperatorStatus": { + "description": "StaticPodOperatorStatus is status for controllers that manage static pods. There are different needs because individual node status must be tracked.", "type": "object", + "required": [ + "readyReplicas" + ], "properties": { "conditions": { - "description": "Conditions summarize the status of the check", + "description": "conditions is a list of conditions and their status", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.PodNetworkConnectivityCheckCondition" + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "failures": { - "description": "Failures contains logs of unsuccessful check actions", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.LogEntry" - } + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, - "outages": { - "description": "Outages contains logs of time periods of outages", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.OutageEntry" - } + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, - "successes": { - "description": "Successes contains logs successful check actions", + "latestAvailableRevisionReason": { + "description": "latestAvailableRevisionReason describe the detailed reason for the most recent deployment", + "type": "string" + }, + "nodeStatuses": { + "description": "nodeStatuses track the deployment values and errors across individual nodes", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatorcontrolplane.v1alpha1.LogEntry" - } + "$ref": "#/definitions/io.openshift.operator.v1.NodeStatus" + }, + "x-kubernetes-list-map-keys": [ + "nodeName" + ], + "x-kubernetes-list-type": "map" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "controlplane.operator.openshift.io", - "Version": "v1alpha1", - "Kind": "PodNetworkConnectivityCheckStatus", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StaticPodOperatorStatus", "Scope": "Namespaced" } }, - "io.openshift.operatoringress.v1.DNSRecord": { - "description": "DNSRecord is a DNS record managed in the zones defined by dns.config.openshift.io/cluster .spec.publicZone and .spec.privateZone.\n\nCluster admin manipulation of this resource is not supported. This resource is only for internal communication of OpenShift operators.\n\nIf DNSManagementPolicy is \"Unmanaged\", the operator will not be responsible for managing the DNS records on the cloud provider.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.StatuspageProvider": { + "description": "StatuspageProvider provides identity for statuspage account.", "type": "object", "required": [ - "spec", - "status" + "pageID" + ], + "properties": { + "pageID": { + "description": "pageID is the unique ID assigned by Statuspage for your page. This must be a public page.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "StatuspageProvider", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.Storage": { + "description": "Storage provides a means to configure an operator to manage the cluster storage operator. `cluster` is the canonical name.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "type": "object", + "required": [ + "spec" ], "properties": { "apiVersion": { @@ -52570,26 +56005,26 @@ "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "spec": { - "description": "spec is the specification of the desired behavior of the dnsRecord.", + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.operatoringress.v1.DNSRecordSpec" + "$ref": "#/definitions/io.openshift.operator.v1.StorageSpec" }, "status": { - "description": "status is the most recently observed status of the dnsRecord.", + "description": "status holds observed values from the cluster. They may not be overridden.", "default": {}, - "$ref": "#/definitions/io.openshift.operatoringress.v1.DNSRecordStatus" + "$ref": "#/definitions/io.openshift.operator.v1.StorageStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "ingress.operator.openshift.io", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "DNSRecord", - "Scope": "Namespaced" + "Kind": "Storage", + "Scope": "Clustered" } }, - "io.openshift.operatoringress.v1.DNSRecordList": { - "description": "DNSRecordList contains a list of dnsrecords.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", + "io.openshift.operator.v1.StorageList": { + "description": "StorageList contains a list of Storages.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", "required": [ "items" @@ -52603,7 +56038,7 @@ "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatoringress.v1.DNSRecord" + "$ref": "#/definitions/io.openshift.operator.v1.Storage" } }, "kind": { @@ -52618,1219 +56053,1139 @@ }, "x-fabric8-info": { "Type": "list", - "Group": "ingress.operator.openshift.io", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "DNSRecordList", + "Kind": "StorageList", "Scope": "Namespaced" } }, - "io.openshift.operatoringress.v1.DNSRecordSpec": { - "description": "DNSRecordSpec contains the details of a DNS record.", + "io.openshift.operator.v1.StorageSpec": { + "description": "StorageSpec is the specification of the desired behavior of the cluster storage operator.", "type": "object", "required": [ - "dnsName", - "targets", - "recordType", - "recordTTL" + "managementState" ], "properties": { - "dnsManagementPolicy": { - "description": "dnsManagementPolicy denotes the current policy applied on the DNS record. Records that have policy set as \"Unmanaged\" are ignored by the ingress operator. This means that the DNS record on the cloud provider is not managed by the operator, and the \"Published\" status condition will be updated to \"Unknown\" status, since it is externally managed. Any existing record on the cloud provider can be deleted at the discretion of the cluster admin.\n\nThis field defaults to Managed. Valid values are \"Managed\" and \"Unmanaged\".", - "type": "string", - "default": "Managed" + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "dnsName": { - "description": "dnsName is the hostname of the DNS record", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" }, - "recordTTL": { - "description": "recordTTL is the record TTL in seconds. If zero, the default is 30. RecordTTL will not be used in AWS regions Alias targets, but will be used in CNAME targets, per AWS API contract.", - "type": "integer", - "format": "int64", - "default": 0 + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" }, - "recordType": { - "description": "recordType is the DNS record type. For example, \"A\" or \"CNAME\".", + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "vsphereStorageDriver": { + "description": "VSphereStorageDriver indicates the storage driver to use on VSphere clusters. Once this field is set to CSIWithMigrationDriver, it can not be changed. If this is empty, the platform will choose a good default, which may change over time without notice. The current default is CSIWithMigrationDriver and may not be changed. DEPRECATED: This field will be removed in a future release.", "type": "string", "default": "" - }, - "targets": { - "description": "targets are record targets.", - "type": "array", - "items": { - "type": "string", - "default": "" - } } }, "x-fabric8-info": { "Type": "nested", - "Group": "ingress.operator.openshift.io", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "DNSRecordSpec", + "Kind": "StorageSpec", "Scope": "Namespaced" } }, - "io.openshift.operatoringress.v1.DNSRecordStatus": { - "description": "DNSRecordStatus is the most recently observed status of each record.", + "io.openshift.operator.v1.StorageStatus": { + "description": "StorageStatus defines the observed status of the cluster storage operator.", "type": "object", + "required": [ + "readyReplicas" + ], "properties": { - "observedGeneration": { - "description": "observedGeneration is the most recently observed generation of the DNSRecord. When the DNSRecord is updated, the controller updates the corresponding record in each managed zone. If an update for a particular zone fails, that failure is recorded in the status condition for the zone so that the controller can determine that it needs to retry the update for that specific zone.", - "type": "integer", - "format": "int64" + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "zones": { - "description": "zones are the status of the record in each zone.", + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatoringress.v1.DNSZoneStatus" - } + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" + }, + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { "Type": "nested", - "Group": "ingress.operator.openshift.io", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "DNSRecordStatus", + "Kind": "StorageStatus", "Scope": "Namespaced" } }, - "io.openshift.operatoringress.v1.DNSZoneCondition": { - "description": "DNSZoneCondition is just the standard condition fields.", + "io.openshift.operator.v1.SyslogLoggingDestinationParameters": { + "description": "SyslogLoggingDestinationParameters describes parameters for the Syslog logging destination type.", "type": "object", "required": [ - "type", - "status" + "address", + "port" ], "properties": { - "lastTransitionTime": { - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" + "address": { + "description": "address is the IP address of the syslog endpoint that receives log messages.", + "type": "string", + "default": "" }, - "message": { + "facility": { + "description": "facility specifies the syslog facility of log messages.\n\nIf this field is empty, the facility is \"local1\".", "type": "string" }, - "reason": { + "maxLength": { + "description": "maxLength is the maximum length of the log message.\n\nValid values are integers in the range 480 to 4096, inclusive.\n\nWhen omitted, the default value is 1024.", + "type": "integer", + "format": "int64" + }, + "port": { + "description": "port is the UDP port number of the syslog endpoint that receives log messages.", + "type": "integer", + "format": "int64", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1", + "Kind": "SyslogLoggingDestinationParameters", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1.Upstream": { + "description": "Upstream can either be of type SystemResolvConf, or of type Network.\n\n - For an Upstream of type SystemResolvConf, no further fields are necessary:\n The upstream will be configured to use /etc/resolv.conf.\n - For an Upstream of type Network, a NetworkResolver field needs to be defined\n with an IP address or IP:port if the upstream listens on a port other than 53.", + "type": "object", + "required": [ + "type" + ], + "properties": { + "address": { + "description": "Address must be defined when Type is set to Network. It will be ignored otherwise. It must be a valid ipv4 or ipv6 address.", "type": "string" }, - "status": { - "type": "string", - "default": "" + "port": { + "description": "Port may be defined when Type is set to Network. It will be ignored otherwise. Port must be between 65535", + "type": "integer", + "format": "int64" }, "type": { + "description": "Type defines whether this upstream contains an IP/IP:port resolver or the local /etc/resolv.conf. Type accepts 2 possible values: SystemResolvConf or Network.\n\n* When SystemResolvConf is used, the Upstream structure does not require any further fields to be defined:\n /etc/resolv.conf will be used\n* When Network is used, the Upstream structure must contain at least an Address", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "ingress.operator.openshift.io", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "DNSZoneCondition", + "Kind": "Upstream", "Scope": "Namespaced" } }, - "io.openshift.operatoringress.v1.DNSZoneStatus": { - "description": "DNSZoneStatus is the status of a record within a specific zone.", + "io.openshift.operator.v1.UpstreamResolvers": { + "description": "UpstreamResolvers defines a schema for configuring the CoreDNS forward plugin in the specific case of the default (\".\") server. It defers from ForwardPlugin in the default values it accepts: * At least one upstream should be specified. * the default policy is Sequential", "type": "object", - "required": [ - "dnsZone" - ], "properties": { - "conditions": { - "description": "conditions are any conditions associated with the record in the zone.\n\nIf publishing the record succeeds, the \"Published\" condition will be set with status \"True\" and upon failure it will be set to \"False\" along with the reason and message describing the cause of the failure.", + "policy": { + "description": "Policy is used to determine the order in which upstream servers are selected for querying. Any one of the following values may be specified:\n\n* \"Random\" picks a random upstream server for each query. * \"RoundRobin\" picks upstream servers in a round-robin order, moving to the next server for each new query. * \"Sequential\" tries querying upstream servers in a sequential order until one responds, starting with the first server for each new query.\n\nThe default value is \"Sequential\"", + "type": "string" + }, + "protocolStrategy": { + "description": "protocolStrategy specifies the protocol to use for upstream DNS requests. Valid values for protocolStrategy are \"TCP\" and omitted. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is to use the protocol of the original client request. \"TCP\" specifies that the platform should use TCP for all upstream DNS requests, even if the client request uses UDP. \"TCP\" is useful for UDP-specific issues such as those created by non-compliant upstream resolvers, but may consume more bandwidth or increase DNS response time. Note that protocolStrategy only affects the protocol of DNS requests that CoreDNS makes to upstream resolvers. It does not affect the protocol of DNS requests between clients and CoreDNS.", + "type": "string", + "default": "" + }, + "transportConfig": { + "description": "transportConfig is used to configure the transport type, server name, and optional custom CA or CA bundle to use when forwarding DNS requests to an upstream resolver.\n\nThe default value is \"\" (empty) which results in a standard cleartext connection being used when forwarding DNS requests to an upstream resolver.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.DNSTransportConfig" + }, + "upstreams": { + "description": "Upstreams is a list of resolvers to forward name queries for the \".\" domain. Each instance of CoreDNS performs health checking of Upstreams. When a healthy upstream returns an error during the exchange, another resolver is tried from Upstreams. The Upstreams are selected in the order specified in Policy.\n\nA maximum of 15 upstreams is allowed per ForwardPlugin. If no Upstreams are specified, /etc/resolv.conf is used by default", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.operatoringress.v1.DNSZoneCondition" + "$ref": "#/definitions/io.openshift.operator.v1.Upstream" } - }, - "dnsZone": { - "description": "dnsZone is the zone where the record is published.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.DNSZone" } }, "x-fabric8-info": { "Type": "nested", - "Group": "ingress.operator.openshift.io", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "DNSZoneStatus", + "Kind": "UpstreamResolvers", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.AllowAllPasswordIdentityProvider": { - "description": "AllowAllPasswordIdentityProvider provides identities for users authenticating using non-empty passwords\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1.VSphereCSIDriverConfigSpec": { + "description": "VSphereCSIDriverConfigSpec defines properties that can be configured for vsphere CSI driver.", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "globalMaxSnapshotsPerBlockVolume": { + "description": "globalMaxSnapshotsPerBlockVolume is a global configuration parameter that applies to volumes on all kinds of datastores. If omitted, the platform chooses a default, which is subject to change over time, currently that default is 3. Snapshots can not be disabled using this parameter. Increasing number of snapshots above 3 can have negative impact on performance, for more details see: https://kb.vmware.com/s/article/1025279 Volume snapshot documentation: https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-E0B41C69-7EEB-450F-A73D-5FD2FF39E891.html", + "type": "integer", + "format": "int64" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "granularMaxSnapshotsPerBlockVolumeInVSAN": { + "description": "granularMaxSnapshotsPerBlockVolumeInVSAN is a granular configuration parameter on vSAN datastore only. It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset. Snapshots for VSAN can not be disabled using this parameter.", + "type": "integer", + "format": "int64" + }, + "granularMaxSnapshotsPerBlockVolumeInVVOL": { + "description": "granularMaxSnapshotsPerBlockVolumeInVVOL is a granular configuration parameter on Virtual Volumes datastore only. It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset. Snapshots for VVOL can not be disabled using this parameter.", + "type": "integer", + "format": "int64" + }, + "topologyCategories": { + "description": "topologyCategories indicates tag categories with which vcenter resources such as hostcluster or datacenter were tagged with. If cluster Infrastructure object has a topology, values specified in Infrastructure object will be used and modifications to topologyCategories will be rejected.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", + "Type": "nested", + "Group": "operator.openshift.io", "Version": "v1", - "Kind": "AllowAllPasswordIdentityProvider", + "Kind": "VSphereCSIDriverConfigSpec", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.BasicAuthPasswordIdentityProvider": { - "description": "BasicAuthPasswordIdentityProvider provides identities for users authenticating using HTTP basic auth credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.BackupJobReference": { + "description": "BackupJobReference holds a reference to the batch/v1 Job created to run the etcd backup", "type": "object", "required": [ - "url", - "ca", - "certFile", - "keyFile" + "namespace", + "name" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "ca": { - "description": "CA is the CA for verifying TLS connections", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", + "name": { + "description": "name is the name of the Job. Required", "type": "string", "default": "" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "url": { - "description": "URL is the remote URL to connect to", + "namespace": { + "description": "namespace is the namespace of the Job. this is always expected to be \"openshift-etcd\" since the user provided PVC is also required to be in \"openshift-etcd\" Required", "type": "string", "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "BasicAuthPasswordIdentityProvider", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "BackupJobReference", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.DenyAllPasswordIdentityProvider": { - "description": "DenyAllPasswordIdentityProvider provides no identities for users\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.DelegatedAuthentication": { + "description": "DelegatedAuthentication allows authentication to be disabled.", "type": "object", "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "disabled": { + "description": "disabled indicates that authentication should be disabled. By default it will use delegated authentication.", + "type": "boolean" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "DenyAllPasswordIdentityProvider", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "DelegatedAuthentication", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.GitHubIdentityProvider": { - "description": "GitHubIdentityProvider provides identities for users authenticating using GitHub credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.DelegatedAuthorization": { + "description": "DelegatedAuthorization allows authorization to be disabled.", "type": "object", - "required": [ - "clientID", - "clientSecret", - "organizations", - "teams", - "hostname", - "ca" - ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "ca": { - "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server. If empty, the default system roots are used. This can only be configured when hostname is set to a non-empty value.", - "type": "string", - "default": "" - }, - "clientID": { - "description": "clientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "clientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.StringSource" - }, - "hostname": { - "description": "hostname is the optional domain (e.g. \"mycompany.com\") for use with a hosted instance of GitHub Enterprise. It must match the GitHub Enterprise settings value that is configured at /setup/settings#hostname.", - "type": "string", - "default": "" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "organizations": { - "description": "organizations optionally restricts which organizations are allowed to log in", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "teams": { - "description": "teams optionally restricts which teams are allowed to log in. Format is \u003corg\u003e/\u003cteam\u003e.", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "disabled": { + "description": "disabled indicates that authorization should be disabled. By default it will use delegated authorization.", + "type": "boolean" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "GitHubIdentityProvider", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "DelegatedAuthorization", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.GitLabIdentityProvider": { - "description": "GitLabIdentityProvider provides identities for users authenticating using GitLab credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.EtcdBackup": { + "description": "# EtcdBackup provides configuration options and status for a one-time backup attempt of the etcd cluster\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "ca", - "url", - "clientID", - "clientSecret" + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ca": { - "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" - }, - "clientID": { - "description": "clientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "clientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.StringSource" - }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "legacy": { - "description": "legacy determines if OAuth2 or OIDC should be used If true, OAuth2 is used If false, OIDC is used If nil and the URL's host is gitlab.com, OIDC is used Otherwise, OAuth2 is used In a future release, nil will default to using OIDC Eventually this flag will be removed and only OIDC will be used", - "type": "boolean" + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "url": { - "description": "url is the oauth server base URL", - "type": "string", - "default": "" + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.EtcdBackupSpec" + }, + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.EtcdBackupStatus" } }, "x-fabric8-info": { "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "GitLabIdentityProvider", - "Scope": "Namespaced" + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "EtcdBackup", + "Scope": "Clustered" } }, - "io.openshift.osin.v1.GoogleIdentityProvider": { - "description": "GoogleIdentityProvider provides identities for users authenticating using Google credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.EtcdBackupList": { + "description": "EtcdBackupList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "clientID", - "clientSecret", - "hostedDomain" + "metadata", + "items" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "clientID": { - "description": "clientID is the oauth client ID", - "type": "string", - "default": "" - }, - "clientSecret": { - "description": "clientSecret is the oauth client secret", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.StringSource" - }, - "hostedDomain": { - "description": "hostedDomain is the optional Google App domain (e.g. \"mycompany.com\") to restrict logins to", - "type": "string", - "default": "" + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.EtcdBackup" + } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "GoogleIdentityProvider", + "Type": "list", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "EtcdBackupList", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.GrantConfig": { - "description": "GrantConfig holds the necessary configuration options for grant handlers", + "io.openshift.operator.v1alpha1.EtcdBackupSpec": { "type": "object", - "required": [ - "method", - "serviceAccountMethod" - ], "properties": { - "method": { - "description": "method determines the default strategy to use when an OAuth client requests a grant. This method will be used only if the specific OAuth client doesn't provide a strategy of their own. Valid grant handling methods are:\n - auto: always approves grant requests, useful for trusted clients\n - prompt: prompts the end user for approval of grant requests, useful for third-party clients\n - deny: always denies grant requests, useful for black-listed clients", - "type": "string", - "default": "" - }, - "serviceAccountMethod": { - "description": "serviceAccountMethod is used for determining client authorization for service account oauth client. It must be either: deny, prompt", + "pvcName": { + "description": "PVCName specifies the name of the PersistentVolumeClaim (PVC) which binds a PersistentVolume where the etcd backup file would be saved The PVC itself must always be created in the \"openshift-etcd\" namespace If the PVC is left unspecified \"\" then the platform will choose a reasonable default location to save the backup. In the future this would be backups saved across the control-plane master nodes.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "GrantConfig", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "EtcdBackupSpec", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.HTPasswdPasswordIdentityProvider": { - "description": "HTPasswdPasswordIdentityProvider provides identities for users authenticating using htpasswd credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.EtcdBackupStatus": { "type": "object", "required": [ - "file" + "backupJob" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "file": { - "description": "file is a reference to your htpasswd file", - "type": "string", - "default": "" + "backupJob": { + "description": "backupJob is the reference to the Job that executes the backup. Optional", + "$ref": "#/definitions/io.openshift.operator.v1alpha1.BackupJobReference" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "conditions": { + "description": "conditions provide details on the status of the etcd backup job.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map", + "x-kubernetes-patch-merge-key": "type", + "x-kubernetes-patch-strategy": "merge" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "HTPasswdPasswordIdentityProvider", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "EtcdBackupStatus", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.IdentityProvider": { - "description": "IdentityProvider provides identities for users authenticating using credentials", + "io.openshift.operator.v1alpha1.GenerationHistory": { + "description": "GenerationHistory keeps track of the generation for a given resource so that decisions about forced updated can be made. DEPRECATED: Use fields in v1.GenerationStatus instead", "type": "object", "required": [ + "group", + "resource", + "namespace", "name", - "challenge", - "login", - "mappingMethod", - "provider" + "lastGeneration" ], "properties": { - "challenge": { - "description": "challenge indicates whether to issue WWW-Authenticate challenges for this provider", - "type": "boolean", - "default": false + "group": { + "description": "group is the group of the thing you're tracking", + "type": "string", + "default": "" }, - "login": { - "description": "login indicates whether to use this identity provider for unauthenticated browsers to login against", - "type": "boolean", - "default": false + "lastGeneration": { + "description": "lastGeneration is the last generation of the workload controller involved", + "type": "integer", + "format": "int64", + "default": 0 }, - "mappingMethod": { - "description": "mappingMethod determines how identities from this provider are mapped to users", + "name": { + "description": "name is the name of the thing you're tracking", "type": "string", "default": "" }, - "name": { - "description": "name is used to qualify the identities returned by this provider", + "namespace": { + "description": "namespace is where the thing you're tracking is", "type": "string", "default": "" }, - "provider": { - "description": "provider contains the information about how to set up a specific identity provider", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + "resource": { + "description": "resource is the resource type of the thing you're tracking", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "IdentityProvider", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "GenerationHistory", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.KeystonePasswordIdentityProvider": { - "description": "KeystonePasswordIdentityProvider provides identities for users authenticating using keystone password credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.GenericOperatorConfig": { + "description": "GenericOperatorConfig provides information to configure an operator\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", - "required": [ - "url", - "ca", - "certFile", - "keyFile", - "domainName", - "useKeystoneIdentity" - ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ca": { - "description": "CA is the CA for verifying TLS connections", - "type": "string", - "default": "" - }, - "certFile": { - "description": "CertFile is a file containing a PEM-encoded certificate", - "type": "string", - "default": "" - }, - "domainName": { - "description": "domainName is required for keystone v3", - "type": "string", - "default": "" + "authentication": { + "description": "authentication allows configuration of authentication for the endpoints", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.DelegatedAuthentication" }, - "keyFile": { - "description": "KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile", - "type": "string", - "default": "" + "authorization": { + "description": "authorization allows configuration of authentication for the endpoints", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.DelegatedAuthorization" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "url": { - "description": "URL is the remote URL to connect to", - "type": "string", - "default": "" + "leaderElection": { + "description": "leaderElection provides information to elect a leader. Only override this if you have a specific need", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.LeaderElection" }, - "useKeystoneIdentity": { - "description": "useKeystoneIdentity flag indicates that user should be authenticated by keystone ID, not by username", - "type": "boolean", - "default": false + "servingInfo": { + "description": "ServingInfo is the HTTP serving information for the controller's endpoints", + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" } }, "x-fabric8-info": { "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "KeystonePasswordIdentityProvider", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "GenericOperatorConfig", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.LDAPAttributeMapping": { - "description": "LDAPAttributeMapping maps LDAP attributes to OpenShift identity fields", + "io.openshift.operator.v1alpha1.ImageContentSourcePolicy": { + "description": "ImageContentSourcePolicy holds cluster-wide information about how to handle registry mirror rules. When multiple policies are defined, the outcome of the behavior is defined on each field.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "id", - "preferredUsername", - "name", - "email" + "spec" ], "properties": { - "email": { - "description": "email is the list of attributes whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "id": { - "description": "id is the list of attributes whose values should be used as the user ID. Required. LDAP standard identity attribute is \"dn\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "name": { - "description": "name is the list of attributes whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity LDAP standard display name attribute is \"cn\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "preferredUsername": { - "description": "preferredUsername is the list of attributes whose values should be used as the preferred username. LDAP standard login attribute is \"uid\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "spec": { + "description": "spec holds user settable values for configuration", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.ImageContentSourcePolicySpec" } }, "x-fabric8-info": { - "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "LDAPAttributeMapping", - "Scope": "Namespaced" + "Type": "object", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "ImageContentSourcePolicy", + "Scope": "Clustered" } }, - "io.openshift.osin.v1.LDAPPasswordIdentityProvider": { - "description": "LDAPPasswordIdentityProvider provides identities for users authenticating using LDAP credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.ImageContentSourcePolicyList": { + "description": "ImageContentSourcePolicyList lists the items in the ImageContentSourcePolicy CRD.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "url", - "bindDN", - "bindPassword", - "insecure", - "ca", - "attributes" + "metadata", + "items" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "attributes": { - "description": "attributes maps LDAP attributes to identities", - "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.LDAPAttributeMapping" - }, - "bindDN": { - "description": "bindDN is an optional DN to bind with during the search phase.", - "type": "string", - "default": "" - }, - "bindPassword": { - "description": "bindPassword is an optional password to bind with during the search phase.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.StringSource" - }, - "ca": { - "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" - }, - "insecure": { - "description": "insecure, if true, indicates the connection should not use TLS. Cannot be set to true with a URL scheme of \"ldaps://\" If false, \"ldaps://\" URLs connect using TLS, and \"ldap://\" URLs are upgraded to a TLS connection using StartTLS as specified in https://tools.ietf.org/html/rfc2830", - "type": "boolean", - "default": false + "items": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.ImageContentSourcePolicy" + } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "url": { - "description": "url is an RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is\n ldap://host:port/basedn?attribute?scope?filter", - "type": "string", - "default": "" + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "LDAPPasswordIdentityProvider", + "Type": "list", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "ImageContentSourcePolicyList", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.OAuthConfig": { - "description": "OAuthConfig holds the necessary configuration options for OAuth authentication", + "io.openshift.operator.v1alpha1.ImageContentSourcePolicySpec": { + "description": "ImageContentSourcePolicySpec is the specification of the ImageContentSourcePolicy CRD.", "type": "object", - "required": [ - "masterCA", - "masterURL", - "masterPublicURL", - "loginURL", - "assetPublicURL", - "alwaysShowProviderSelection", - "identityProviders", - "grantConfig", - "sessionConfig", - "tokenConfig", - "templates" - ], "properties": { - "alwaysShowProviderSelection": { - "description": "alwaysShowProviderSelection will force the provider selection page to render even when there is only a single provider.", - "type": "boolean", - "default": false - }, - "assetPublicURL": { - "description": "assetPublicURL is used for building valid client redirect URLs for external access", - "type": "string", - "default": "" - }, - "grantConfig": { - "description": "grantConfig describes how to handle grants", - "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.GrantConfig" - }, - "identityProviders": { - "description": "identityProviders is an ordered list of ways for a user to identify themselves", + "repositoryDigestMirrors": { + "description": "repositoryDigestMirrors allows images referenced by image digests in pods to be pulled from alternative mirrored repository locations. The image pull specification provided to the pod will be compared to the source locations described in RepositoryDigestMirrors and the image may be pulled down from any of the mirrors in the list instead of the specified repository allowing administrators to choose a potentially faster mirror. Only image pull specifications that have an image digest will have this behavior applied to them - tags will continue to be pulled from the specified repository in the pull spec.\n\nEach “source” repository is treated independently; configurations for different “source” repositories don’t interact.\n\nWhen multiple policies are defined for the same “source” repository, the sets of defined mirrors will be merged together, preserving the relative order of the mirrors, if possible. For example, if policy A has mirrors `a, b, c` and policy B has mirrors `c, d, e`, the mirrors will be used in the order `a, b, c, d, e`. If the orders of mirror entries conflict (e.g. `a, b` vs. `b, a`) the configuration is not rejected but the resulting order is unspecified.", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.IdentityProvider" + "$ref": "#/definitions/io.openshift.operator.v1alpha1.RepositoryDigestMirrors" } - }, - "loginURL": { - "description": "loginURL, along with masterCA, masterURL and masterPublicURL have distinct meanings depending on how the OAuth server is run. The two states are: 1. embedded in the kube api server (all 3.x releases) 2. as a standalone external process (all 4.x releases) in the embedded configuration, loginURL is equivalent to masterPublicURL and the other fields have functionality that matches their docs. in the standalone configuration, the fields are used as: loginURL is the URL required to login to the cluster: oc login --server=\u003cloginURL\u003e masterPublicURL is the issuer URL it is accessible from inside (service network) and outside (ingress) of the cluster masterURL is the loopback variation of the token_endpoint URL with no path component it is only accessible from inside (service network) of the cluster masterCA is used to perform TLS verification for connections made to masterURL For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2", - "type": "string", - "default": "" - }, - "masterCA": { - "description": "masterCA is the CA for verifying the TLS connection back to the MasterURL. This field is deprecated and will be removed in a future release. See loginURL for details. Deprecated", - "type": "string" - }, - "masterPublicURL": { - "description": "masterPublicURL is used for building valid client redirect URLs for internal and external access This field is deprecated and will be removed in a future release. See loginURL for details. Deprecated", - "type": "string", - "default": "" - }, - "masterURL": { - "description": "masterURL is used for making server-to-server calls to exchange authorization codes for access tokens This field is deprecated and will be removed in a future release. See loginURL for details. Deprecated", - "type": "string", - "default": "" - }, - "sessionConfig": { - "description": "sessionConfig hold information about configuring sessions.", - "$ref": "#/definitions/io.openshift.osin.v1.SessionConfig" - }, - "templates": { - "description": "templates allow you to customize pages like the login page.", - "$ref": "#/definitions/io.openshift.osin.v1.OAuthTemplates" - }, - "tokenConfig": { - "description": "tokenConfig contains options for authorization and access tokens", - "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.TokenConfig" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "OAuthConfig", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "ImageContentSourcePolicySpec", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.OAuthTemplates": { - "description": "OAuthTemplates allow for customization of pages like the login page", + "io.openshift.operator.v1alpha1.LoggingConfig": { + "description": "LoggingConfig holds information about configuring logging DEPRECATED: Use v1.LogLevel instead", "type": "object", "required": [ - "login", - "providerSelection", - "error" + "level", + "vmodule" ], "properties": { - "error": { - "description": "error is a path to a file containing a go template used to render error pages during the authentication or grant flow If unspecified, the default error page is used.", - "type": "string", - "default": "" - }, - "login": { - "description": "login is a path to a file containing a go template used to render the login page. If unspecified, the default login page is used.", - "type": "string", - "default": "" + "level": { + "description": "level is passed to glog.", + "type": "integer", + "format": "int64", + "default": 0 }, - "providerSelection": { - "description": "providerSelection is a path to a file containing a go template used to render the provider selection page. If unspecified, the default provider selection page is used.", + "vmodule": { + "description": "vmodule is passed to glog.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "OAuthTemplates", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "LoggingConfig", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.OpenIDClaims": { - "description": "OpenIDClaims contains a list of OpenID claims to use when authenticating with an OpenID identity provider", + "io.openshift.operator.v1alpha1.NodeStatus": { + "description": "NodeStatus provides information about the current state of a particular node managed by this operator. Deprecated: Use v1.NodeStatus instead", "type": "object", "required": [ - "id", - "preferredUsername", - "name", - "email", - "groups" + "nodeName", + "currentDeploymentGeneration", + "targetDeploymentGeneration", + "lastFailedDeploymentGeneration", + "lastFailedDeploymentErrors" ], "properties": { - "email": { - "description": "email is the list of claims whose values should be used as the email address. Optional. If unspecified, no email is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "currentDeploymentGeneration": { + "description": "currentDeploymentGeneration is the generation of the most recently successful deployment", + "type": "integer", + "format": "int32", + "default": 0 }, - "groups": { - "description": "groups is the list of claims value of which should be used to synchronize groups from the OIDC provider to OpenShift for the user", + "lastFailedDeploymentErrors": { + "description": "lastFailedDeploymentGenerationErrors is a list of the errors during the failed deployment referenced in lastFailedDeploymentGeneration", "type": "array", "items": { "type": "string", "default": "" } }, - "id": { - "description": "id is the list of claims whose values should be used as the user ID. Required. OpenID standard identity claim is \"sub\"", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "lastFailedDeploymentGeneration": { + "description": "lastFailedDeploymentGeneration is the generation of the deployment we tried and failed to deploy.", + "type": "integer", + "format": "int32", + "default": 0 }, - "name": { - "description": "name is the list of claims whose values should be used as the display name. Optional. If unspecified, no display name is set for the identity", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "nodeName": { + "description": "nodeName is the name of the node", + "type": "string", + "default": "" }, - "preferredUsername": { - "description": "preferredUsername is the list of claims whose values should be used as the preferred username. If unspecified, the preferred username is determined from the value of the id claim", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "targetDeploymentGeneration": { + "description": "targetDeploymentGeneration is the generation of the deployment we're trying to apply", + "type": "integer", + "format": "int32", + "default": 0 } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "OpenIDClaims", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "NodeStatus", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.OpenIDIdentityProvider": { - "description": "OpenIDIdentityProvider provides identities for users authenticating using OpenID credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.OLM": { + "description": "OLM provides information to configure an operator to manage the OLM controllers\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", "type": "object", "required": [ - "ca", - "clientID", - "clientSecret", - "extraScopes", - "extraAuthorizeParameters", - "urls", - "claims" + "metadata", + "spec" ], "properties": { "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", "type": "string" }, - "ca": { - "description": "ca is the optional trusted certificate authority bundle to use when making requests to the server If empty, the default system roots are used", - "type": "string", - "default": "" + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" }, - "claims": { - "description": "claims mappings", + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.OpenIDClaims" - }, - "clientID": { - "description": "clientID is the oauth client ID", - "type": "string", - "default": "" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, - "clientSecret": { - "description": "clientSecret is the oauth client secret", + "spec": { + "description": "spec holds user settable values for configuration", "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.StringSource" + "$ref": "#/definitions/io.openshift.operator.v1alpha1.OLMSpec" }, - "extraAuthorizeParameters": { - "description": "extraAuthorizeParameters are any custom parameters to add to the authorize request.", - "type": "object", - "additionalProperties": { - "type": "string", - "default": "" - } + "status": { + "description": "status holds observed values from the cluster. They may not be overridden.", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.OLMStatus" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OLM", + "Scope": "Clustered" + } + }, + "io.openshift.operator.v1alpha1.OLMList": { + "description": "OLMList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "type": "object", + "required": [ + "metadata", + "items" + ], + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" }, - "extraScopes": { - "description": "extraScopes are any scopes to request in addition to the standard \"openid\" scope.", + "items": { + "description": "Items contains the items", "type": "array", "items": { - "type": "string", - "default": "" + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.OLM" } }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, - "urls": { - "description": "urls to use to authenticate", + "metadata": { + "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.OpenIDURLs" + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "OpenIDIdentityProvider", + "Type": "list", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OLMList", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.OpenIDURLs": { - "description": "OpenIDURLs are URLs to use when authenticating with an OpenID identity provider", + "io.openshift.operator.v1alpha1.OLMSpec": { "type": "object", "required": [ - "authorize", - "token", - "userInfo" + "managementState" ], "properties": { - "authorize": { - "description": "authorize is the oauth authorization URL", - "type": "string", - "default": "" + "logLevel": { + "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" }, - "token": { - "description": "token is the oauth token granting URL", + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", "type": "string", "default": "" }, - "userInfo": { - "description": "userInfo is the optional userinfo URL. If present, a granted access_token is used to request claims If empty, a granted id_token is parsed for claims", - "type": "string", - "default": "" + "observedConfig": { + "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" + }, + "operatorLogLevel": { + "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", + "type": "string" + }, + "unsupportedConfigOverrides": { + "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "OpenIDURLs", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OLMSpec", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.OsinServerConfig": { - "description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.OLMStatus": { "type": "object", "required": [ - "servingInfo", - "corsAllowedOrigins", - "auditConfig", - "storageConfig", - "admission", - "kubeClientConfig", - "oauthConfig" + "readyReplicas" ], "properties": { - "admission": { - "description": "admissionConfig holds information about how to configure admission.", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AdmissionConfig" - }, - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "auditConfig": { - "description": "auditConfig describes how to configure audit information", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.AuditConfig" - }, - "corsAllowedOrigins": { - "description": "corsAllowedOrigins", + "conditions": { + "description": "conditions is a list of conditions and their status", "type": "array", "items": { - "type": "string", - "default": "" - } + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" + }, + "x-kubernetes-list-map-keys": [ + "type" + ], + "x-kubernetes-list-type": "map" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "generations": { + "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" + }, + "x-kubernetes-list-map-keys": [ + "group", + "resource", + "namespace", + "name" + ], + "x-kubernetes-list-type": "map" }, - "kubeClientConfig": { - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.KubeClientConfig" + "latestAvailableRevision": { + "description": "latestAvailableRevision is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32" }, - "oauthConfig": { - "description": "oauthConfig holds the necessary configuration options for OAuth authentication", - "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.OAuthConfig" + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" }, - "servingInfo": { - "description": "servingInfo describes how to start serving", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.HTTPServingInfo" + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", + "type": "integer", + "format": "int32", + "default": 0 }, - "storageConfig": { - "description": "storageConfig contains information about how to use", - "default": {}, - "$ref": "#/definitions/io.openshift.config.v1.EtcdStorageConfig" + "version": { + "description": "version is the level this availability applies to", + "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "OsinServerConfig", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OLMStatus", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.RequestHeaderIdentityProvider": { - "description": "RequestHeaderIdentityProvider provides identities for users authenticating using request header credentials\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.OperatorCondition": { + "description": "OperatorCondition is just the standard condition fields. DEPRECATED: Use v1.OperatorCondition instead", "type": "object", "required": [ - "loginURL", - "challengeURL", - "clientCA", - "clientCommonNames", - "headers", - "preferredUsernameHeaders", - "nameHeaders", - "emailHeaders" + "type", + "status" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "challengeURL": { - "description": "challengeURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect WWW-Authenticate challenges will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", - "type": "string", - "default": "" - }, - "clientCA": { - "description": "clientCA is a file with the trusted signer certs. If empty, no request verification is done, and any direct request to the OAuth server can impersonate any identity from this provider, merely by setting a request header.", - "type": "string", - "default": "" - }, - "clientCommonNames": { - "description": "clientCommonNames is an optional list of common names to require a match from. If empty, any client certificate validated against the clientCA bundle is considered authoritative.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "emailHeaders": { - "description": "emailHeaders is the set of headers to check for the email address", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "headers": { - "description": "headers is the set of headers to check for identity information", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "lastTransitionTime": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "message": { "type": "string" }, - "loginURL": { - "description": "loginURL is a URL to redirect unauthenticated /authorize requests to Unauthenticated requests from OAuth clients which expect interactive logins will be redirected here ${url} is replaced with the current URL, escaped to be safe in a query parameter\n https://www.example.com/sso-login?then=${url}\n${query} is replaced with the current query string\n https://www.example.com/auth-proxy/oauth/authorize?${query}", + "reason": { + "type": "string" + }, + "status": { "type": "string", "default": "" }, - "nameHeaders": { - "description": "nameHeaders is the set of headers to check for the display name", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "preferredUsernameHeaders": { - "description": "preferredUsernameHeaders is the set of headers to check for the preferred username", - "type": "array", - "items": { - "type": "string", - "default": "" - } + "type": { + "type": "string", + "default": "" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "RequestHeaderIdentityProvider", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OperatorCondition", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.SessionConfig": { - "description": "SessionConfig specifies options for cookie-based sessions. Used by AuthRequestHandlerSession", + "io.openshift.operator.v1alpha1.OperatorSpec": { + "description": "OperatorSpec contains common fields for an operator to need. It is intended to be anonymous included inside of the Spec struct for you particular operator. DEPRECATED: Use v1.OperatorSpec instead", "type": "object", "required": [ - "sessionSecretsFile", - "sessionMaxAgeSeconds", - "sessionName" + "managementState", + "imagePullSpec", + "imagePullPolicy", + "version" ], "properties": { - "sessionMaxAgeSeconds": { - "description": "sessionMaxAgeSeconds specifies how long created sessions last. Used by AuthRequestHandlerSession", - "type": "integer", - "format": "int32", - "default": 0 + "imagePullPolicy": { + "description": "imagePullPolicy specifies the image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.", + "type": "string", + "default": "" }, - "sessionName": { - "description": "sessionName is the cookie name used to store the session", + "imagePullSpec": { + "description": "imagePullSpec is the image to use for the component.", "type": "string", "default": "" }, - "sessionSecretsFile": { - "description": "sessionSecretsFile is a reference to a file containing a serialized SessionSecrets object If no file is specified, a random signing and encryption key are generated at each server start", + "logging": { + "description": "logging contains glog parameters for the component pods. It's always a command line arg for the moment", + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.LoggingConfig" + }, + "managementState": { + "description": "managementState indicates whether and how the operator should manage the component", + "type": "string", + "default": "" + }, + "version": { + "description": "version is the desired state in major.minor.micro-patch. Usually patch is ignored.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "SessionConfig", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OperatorSpec", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.SessionSecret": { - "description": "SessionSecret is a secret used to authenticate/decrypt cookie-based sessions", + "io.openshift.operator.v1alpha1.OperatorStatus": { + "description": "OperatorStatus contains common fields for an operator to need. It is intended to be anonymous included inside of the Status struct for you particular operator. DEPRECATED: Use v1.OperatorStatus instead", + "type": "object", + "properties": { + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.OperatorCondition" + } + }, + "currentVersionAvailability": { + "description": "currentVersionAvailability is availability information for the current version. If it is unmanged or removed, this doesn't exist.", + "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "state": { + "description": "state indicates what the operator has observed to be its current operational status.", + "type": "string" + }, + "targetVersionAvailability": { + "description": "targetVersionAvailability is availability information for the target version if we are migrating", + "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" + }, + "taskSummary": { + "description": "taskSummary is a high level summary of what the controller is currently attempting to do. It is high-level, human-readable and not guaranteed in any way. (I needed this for debugging and realized it made a great summary).", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "OperatorStatus", + "Scope": "Namespaced" + } + }, + "io.openshift.operator.v1alpha1.RepositoryDigestMirrors": { + "description": "RepositoryDigestMirrors holds cluster-wide information about how to handle mirros in the registries config. Note: the mirrors only work when pulling the images that are referenced by their digests.", "type": "object", "required": [ - "authentication", - "encryption" + "source" ], "properties": { - "authentication": { - "description": "Authentication is used to authenticate sessions using HMAC. Recommended to use a secret with 32 or 64 bytes.", - "type": "string", - "default": "" + "mirrors": { + "description": "mirrors is one or more repositories that may also contain the same images. The order of mirrors in this list is treated as the user's desired priority, while source is by default considered lower priority than all mirrors. Other cluster configuration, including (but not limited to) other repositoryDigestMirrors objects, may impact the exact order mirrors are contacted in, or some mirrors may be contacted in parallel, so this should be considered a preference rather than a guarantee of ordering.", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "encryption": { - "description": "Encryption is used to encrypt sessions. Must be 16, 24, or 32 characters long, to select AES-128, AES-", + "source": { + "description": "source is the repository that users refer to, e.g. in image pull specifications.", "type": "string", "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "SessionSecret", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "RepositoryDigestMirrors", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.SessionSecrets": { - "description": "SessionSecrets list the secrets to use to sign/encrypt and authenticate/decrypt created sessions.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", + "io.openshift.operator.v1alpha1.StaticPodOperatorStatus": { + "description": "StaticPodOperatorStatus is status for controllers that manage static pods. There are different needs because individual node status must be tracked. DEPRECATED: Use v1.StaticPodOperatorStatus instead", "type": "object", "required": [ - "secrets" + "latestAvailableDeploymentGeneration", + "nodeStatuses" ], "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" + "conditions": { + "description": "conditions is a list of conditions and their status", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.OperatorCondition" + } }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" + "currentVersionAvailability": { + "description": "currentVersionAvailability is availability information for the current version. If it is unmanged or removed, this doesn't exist.", + "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" }, - "secrets": { - "description": "Secrets is a list of secrets New sessions are signed and encrypted using the first secret. Existing sessions are decrypted/authenticated by each secret until one succeeds. This allows rotating secrets.", + "latestAvailableDeploymentGeneration": { + "description": "latestAvailableDeploymentGeneration is the deploymentID of the most recent deployment", + "type": "integer", + "format": "int32", + "default": 0 + }, + "nodeStatuses": { + "description": "nodeStatuses track the deployment values and errors across individual nodes", "type": "array", "items": { "default": {}, - "$ref": "#/definitions/io.openshift.osin.v1.SessionSecret" + "$ref": "#/definitions/io.openshift.operator.v1alpha1.NodeStatus" } + }, + "observedGeneration": { + "description": "observedGeneration is the last generation change you've dealt with", + "type": "integer", + "format": "int64" + }, + "state": { + "description": "state indicates what the operator has observed to be its current operational status.", + "type": "string" + }, + "targetVersionAvailability": { + "description": "targetVersionAvailability is availability information for the target version if we are migrating", + "$ref": "#/definitions/io.openshift.operator.v1alpha1.VersionAvailability" + }, + "taskSummary": { + "description": "taskSummary is a high level summary of what the controller is currently attempting to do. It is high-level, human-readable and not guaranteed in any way. (I needed this for debugging and realized it made a great summary).", + "type": "string" } }, "x-fabric8-info": { - "Type": "object", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "SessionSecrets", + "Type": "nested", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "StaticPodOperatorStatus", "Scope": "Namespaced" } }, - "io.openshift.osin.v1.TokenConfig": { - "description": "TokenConfig holds the necessary configuration options for authorization and access tokens", + "io.openshift.operator.v1alpha1.VersionAvailability": { + "description": "VersionAvailability gives information about the synchronization and operational status of a particular version of the component DEPRECATED: Use fields in v1.OperatorStatus instead", "type": "object", + "required": [ + "version", + "updatedReplicas", + "readyReplicas", + "errors", + "generations" + ], "properties": { - "accessTokenInactivityTimeout": { - "description": "accessTokenInactivityTimeout defines the token inactivity timeout for tokens granted by any client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. Takes valid time duration string such as \"5m\", \"1.5h\" or \"2h45m\". The minimum allowed value for duration is 300s (5 minutes). If the timeout is configured per client, then that value takes precedence. If the timeout value is not specified and the client does not override the value, then tokens are valid until their lifetime.", - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration" + "errors": { + "description": "errors indicates what failures are associated with the operator trying to manage this version", + "type": "array", + "items": { + "type": "string", + "default": "" + } }, - "accessTokenInactivityTimeoutSeconds": { - "description": "accessTokenInactivityTimeoutSeconds - DEPRECATED: setting this field has no effect.", - "type": "integer", - "format": "int32" + "generations": { + "description": "generations allows an operator to track what the generation of \"important\" resources was the last time we updated them", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.operator.v1alpha1.GenerationHistory" + } }, - "accessTokenMaxAgeSeconds": { - "description": "accessTokenMaxAgeSeconds defines the maximum age of access tokens", + "readyReplicas": { + "description": "readyReplicas indicates how many replicas are ready and at the desired state", "type": "integer", - "format": "int32" + "format": "int32", + "default": 0 }, - "authorizeTokenMaxAgeSeconds": { - "description": "authorizeTokenMaxAgeSeconds defines the maximum age of authorize tokens", + "updatedReplicas": { + "description": "updatedReplicas indicates how many replicas are at the desired state", "type": "integer", - "format": "int32" + "format": "int32", + "default": 0 + }, + "version": { + "description": "version is the level this availability applies to", + "type": "string", + "default": "" } }, "x-fabric8-info": { "Type": "nested", - "Group": "osin.config.openshift.io", - "Version": "v1", - "Kind": "TokenConfig", + "Group": "operator.openshift.io", + "Version": "v1alpha1", + "Kind": "VersionAvailability", "Scope": "Namespaced" } }, @@ -54942,251 +58297,6 @@ "Scope": "Namespaced" } }, - "io.openshift.samples.v1.Config": { - "description": "Config contains the configuration and detailed condition status for the Samples Operator.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "spec" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "default": {}, - "$ref": "#/definitions/io.openshift.samples.v1.ConfigSpec" - }, - "status": { - "default": {}, - "$ref": "#/definitions/io.openshift.samples.v1.ConfigStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "samples.operator.openshift.io", - "Version": "v1", - "Kind": "Config", - "Scope": "Clustered" - } - }, - "io.openshift.samples.v1.ConfigCondition": { - "description": "ConfigCondition captures various conditions of the Config as entries are processed.", - "type": "object", - "required": [ - "type", - "status" - ], - "properties": { - "lastTransitionTime": { - "description": "lastTransitionTime is the last time the condition transitioned from one status to another.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "lastUpdateTime": { - "description": "lastUpdateTime is the last time this condition was updated.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time" - }, - "message": { - "description": "message is a human readable message indicating details about the transition.", - "type": "string" - }, - "reason": { - "description": "reason is what caused the condition's last transition.", - "type": "string" - }, - "status": { - "description": "status of the condition, one of True, False, Unknown.", - "type": "string", - "default": "" - }, - "type": { - "description": "type of condition.", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "samples.operator.openshift.io", - "Version": "v1", - "Kind": "ConfigCondition", - "Scope": "Namespaced" - } - }, - "io.openshift.samples.v1.ConfigList": { - "description": "Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "metadata", - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.samples.v1.Config" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "samples.operator.openshift.io", - "Version": "v1", - "Kind": "ConfigList", - "Scope": "Namespaced" - } - }, - "io.openshift.samples.v1.ConfigSpec": { - "description": "ConfigSpec contains the desired configuration and state for the Samples Operator, controlling various behavior around the imagestreams and templates it creates/updates in the openshift namespace.", - "type": "object", - "properties": { - "architectures": { - "description": "architectures determine which hardware architecture(s) to install, where x86_64, ppc64le, and s390x are the only supported choices currently.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "managementState": { - "description": "managementState is top level on/off type of switch for all operators. When \"Managed\", this operator processes config and manipulates the samples accordingly. When \"Unmanaged\", this operator ignores any updates to the resources it watches. When \"Removed\", it reacts that same wasy as it does if the Config object is deleted, meaning any ImageStreams or Templates it manages (i.e. it honors the skipped lists) and the registry secret are deleted, along with the ConfigMap in the operator's namespace that represents the last config used to manipulate the samples,", - "type": "string" - }, - "samplesRegistry": { - "description": "samplesRegistry allows for the specification of which registry is accessed by the ImageStreams for their image content. Defaults on the content in https://github.com/openshift/library that are pulled into this github repository, but based on our pulling only ocp content it typically defaults to registry.redhat.io.", - "type": "string" - }, - "skippedHelmCharts": { - "description": "skippedHelmCharts specifies names of helm charts that should NOT be managed. Admins can use this to allow them to delete content they don’t want. They will still have to MANUALLY DELETE the content but the operator will not recreate(or update) anything listed here. Few examples of the name of helmcharts which can be skipped are 'redhat-redhat-perl-imagestreams','redhat-redhat-nodejs-imagestreams','redhat-nginx-imagestreams', 'redhat-redhat-ruby-imagestreams','redhat-redhat-python-imagestreams','redhat-redhat-php-imagestreams', 'redhat-httpd-imagestreams','redhat-redhat-dotnet-imagestreams'. Rest of the names can be obtained from openshift console --\u003e helmcharts --\u003einstalled helmcharts. This will display the list of all the 12 helmcharts(of imagestreams)being installed by Samples Operator. The skippedHelmCharts must be a valid Kubernetes resource name. May contain only lowercase alphanumeric characters, hyphens and periods, and each period separated segment must begin and end with an alphanumeric character. It must be non-empty and at most 253 characters in length", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-list-type": "set" - }, - "skippedImagestreams": { - "description": "skippedImagestreams specifies names of image streams that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "skippedTemplates": { - "description": "skippedTemplates specifies names of templates that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", - "type": "array", - "items": { - "type": "string", - "default": "" - } - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "samples.operator.openshift.io", - "Version": "v1", - "Kind": "ConfigSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.samples.v1.ConfigStatus": { - "description": "ConfigStatus contains the actual configuration in effect, as well as various details that describe the state of the Samples Operator.", - "type": "object", - "properties": { - "architectures": { - "description": "architectures determine which hardware architecture(s) to install, where x86_64 and ppc64le are the supported choices.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "conditions": { - "description": "conditions represents the available maintenance status of the sample imagestreams and templates.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.samples.v1.ConfigCondition" - }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "managementState": { - "description": "managementState reflects the current operational status of the on/off switch for the operator. This operator compares the ManagementState as part of determining that we are turning the operator back on (i.e. \"Managed\") when it was previously \"Unmanaged\".", - "type": "string", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "samplesRegistry": { - "description": "samplesRegistry allows for the specification of which registry is accessed by the ImageStreams for their image content. Defaults on the content in https://github.com/openshift/library that are pulled into this github repository, but based on our pulling only ocp content it typically defaults to registry.redhat.io.", - "type": "string", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "skippedImagestreams": { - "description": "skippedImagestreams specifies names of image streams that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "skippedTemplates": { - "description": "skippedTemplates specifies names of templates that should NOT be created/updated. Admins can use this to allow them to delete content they don’t want. They will still have to manually delete the content but the operator will not recreate(or update) anything listed here.", - "type": "array", - "items": { - "type": "string", - "default": "" - }, - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - }, - "version": { - "description": "version is the value of the operator's payload based version indicator when it was last successfully processed", - "type": "string", - "x-kubernetes-patch-merge-key": "type", - "x-kubernetes-patch-strategy": "merge" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "samples.operator.openshift.io", - "Version": "v1", - "Kind": "ConfigStatus", - "Scope": "Namespaced" - } - }, "io.openshift.security.v1.AllowedFlexVolume": { "description": "AllowedFlexVolume represents a single Flexvolume that is allowed to be used.", "type": "object", @@ -55218,7 +58328,8 @@ "items": { "default": {}, "$ref": "#/definitions/io.openshift.security.v1.IDRange" - } + }, + "x-kubernetes-list-type": "atomic" }, "type": { "description": "Type is the strategy that will dictate what FSGroup is used in the SecurityContext.", @@ -55271,6 +58382,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "spec": { "description": "spec is the PodSecurityPolicy to check.", "default": {}, @@ -55358,6 +58474,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "spec": { "description": "spec defines specification the PodSecurityPolicySelfSubjectReview.", "default": {}, @@ -55413,6 +58534,11 @@ "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", "type": "string" }, + "metadata": { + "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, "spec": { "description": "spec defines specification for the PodSecurityPolicySubjectReview.", "default": {}, @@ -55679,7 +58805,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "allowedFlexVolumes": { "description": "AllowedFlexVolumes is a whitelist of allowed Flexvolumes. Empty or nil indicates that all Flexvolumes may be used. This parameter is effective only when the usage of the Flexvolumes is allowed in the \"Volumes\" field.", @@ -55687,7 +58814,8 @@ "items": { "default": {}, "$ref": "#/definitions/io.openshift.security.v1.AllowedFlexVolume" - } + }, + "x-kubernetes-list-type": "atomic" }, "allowedUnsafeSysctls": { "description": "AllowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none. Each entry is either a plain sysctl name or ends in \"*\" in which case it is considered as a prefix of allowed sysctls. Single * means all unsafe sysctls are allowed. Kubelet has to whitelist all allowed unsafe sysctls explicitly to avoid rejection.\n\nExamples: e.g. \"foo/*\" allows \"foo/bar\", \"foo/baz\", etc. e.g. \"foo.*\" allows \"foo.bar\", \"foo.baz\", etc.", @@ -55695,7 +58823,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "apiVersion": { "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", @@ -55707,7 +58836,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "defaultAllowPrivilegeEscalation": { "description": "DefaultAllowPrivilegeEscalation controls the default setting for whether a process can gain more privileges than its parent process.", @@ -55719,7 +58849,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "fsGroup": { "description": "FSGroup is the strategy that will dictate what fs group is used by the SecurityContext.", @@ -55732,7 +58863,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "kind": { "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", @@ -55759,7 +58891,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "runAsUser": { "description": "RunAsUser is the strategy that will dictate what RunAsUser is used in the SecurityContext.", @@ -55777,20 +58910,27 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "supplementalGroups": { "description": "SupplementalGroups is the strategy that will dictate what supplemental groups are used by the SecurityContext.", "default": {}, "$ref": "#/definitions/io.openshift.security.v1.SupplementalGroupsStrategyOptions" }, + "userNamespaceLevel": { + "description": "userNamespaceLevel determines if the policy allows host users in containers. Valid values are \"AllowHostLevel\", \"RequirePodLevel\", and omitted. When \"AllowHostLevel\" is set, a pod author may set `hostUsers` to either `true` or `false`. When \"RequirePodLevel\" is set, a pod author must set `hostUsers` to `false`. When omitted, the default value is \"AllowHostLevel\".", + "type": "string", + "default": "AllowHostLevel" + }, "users": { "description": "The users who have permissions to use this security context constraints", "type": "array", "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" }, "volumes": { "description": "Volumes is a white list of allowed volume plugins. FSType corresponds directly with the field names of a VolumeSource (azureFile, configMap, emptyDir). To allow all volumes you may use \"*\". To allow no volumes, set to [\"none\"].", @@ -55798,7 +58938,8 @@ "items": { "type": "string", "default": "" - } + }, + "x-kubernetes-list-type": "atomic" } }, "x-fabric8-info": { @@ -55890,7 +59031,8 @@ "items": { "default": {}, "$ref": "#/definitions/io.openshift.security.v1.IDRange" - } + }, + "x-kubernetes-list-type": "atomic" }, "type": { "description": "Type is the strategy that will dictate what supplemental groups is used in the SecurityContext.", @@ -55905,248 +59047,6 @@ "Scope": "Namespaced" } }, - "io.openshift.securityinternal.v1.RangeAllocation": { - "description": "RangeAllocation is used so we can easily expose a RangeAllocation typed for security group This is an internal API, not intended for external consumption.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "range", - "data" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "data": { - "description": "data is a byte array representing the serialized state of a range allocation. It is a bitmap with each bit set to one to represent a range is taken.", - "type": "string", - "format": "byte" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "range": { - "description": "range is a string representing a unique label for a range of uids, \"1000000000-2000000000/10000\".", - "type": "string", - "default": "" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "security.internal.openshift.io", - "Version": "v1", - "Kind": "RangeAllocation", - "Scope": "Clustered" - } - }, - "io.openshift.securityinternal.v1.RangeAllocationList": { - "description": "RangeAllocationList is a list of RangeAllocations objects This is an internal API, not intended for external consumption.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", - "type": "object", - "required": [ - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "description": "List of RangeAllocations.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.securityinternal.v1.RangeAllocation" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "security.internal.openshift.io", - "Version": "v1", - "Kind": "RangeAllocationList", - "Scope": "Namespaced" - } - }, - "io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfig": { - "description": "ServiceCertSignerOperatorConfig provides information to configure an operator to manage the service cert signing controllers\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "type": "object", - "required": [ - "metadata", - "spec", - "status" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" - }, - "spec": { - "default": {}, - "$ref": "#/definitions/io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigSpec" - }, - "status": { - "default": {}, - "$ref": "#/definitions/io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigStatus" - } - }, - "x-fabric8-info": { - "Type": "object", - "Group": "servicecertsigner.config.openshift.io", - "Version": "v1alpha1", - "Kind": "ServiceCertSignerOperatorConfig", - "Scope": "Clustered" - } - }, - "io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigList": { - "description": "ServiceCertSignerOperatorConfigList is a collection of items\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.", - "type": "object", - "required": [ - "items" - ], - "properties": { - "apiVersion": { - "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - "type": "string" - }, - "items": { - "description": "Items contains the items", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfig" - } - }, - "kind": { - "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - "type": "string" - }, - "metadata": { - "description": "metadata is the standard list's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta" - } - }, - "x-fabric8-info": { - "Type": "list", - "Group": "servicecertsigner.config.openshift.io", - "Version": "v1alpha1", - "Kind": "ServiceCertSignerOperatorConfigList", - "Scope": "Namespaced" - } - }, - "io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigSpec": { - "type": "object", - "required": [ - "managementState" - ], - "properties": { - "logLevel": { - "description": "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "managementState": { - "description": "managementState indicates whether and how the operator should manage the component", - "type": "string", - "default": "" - }, - "observedConfig": { - "description": "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - }, - "operatorLogLevel": { - "description": "operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for themselves.\n\nValid values are: \"Normal\", \"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\".", - "type": "string" - }, - "unsupportedConfigOverrides": { - "description": "unsupportedConfigOverrides overrides the final configuration that was computed by the operator. Red Hat does not support the use of this field. Misuse of this field could lead to unexpected behavior or conflict with other configuration options. Seek guidance from the Red Hat support before using this field. Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.", - "default": {}, - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.RawExtension" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "servicecertsigner.config.openshift.io", - "Version": "v1alpha1", - "Kind": "ServiceCertSignerOperatorConfigSpec", - "Scope": "Namespaced" - } - }, - "io.openshift.servicecertsigner.v1alpha1.ServiceCertSignerOperatorConfigStatus": { - "type": "object", - "required": [ - "readyReplicas" - ], - "properties": { - "conditions": { - "description": "conditions is a list of conditions and their status", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.OperatorCondition" - }, - "x-kubernetes-list-map-keys": [ - "type" - ], - "x-kubernetes-list-type": "map" - }, - "generations": { - "description": "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/io.openshift.operator.v1.GenerationStatus" - }, - "x-kubernetes-list-type": "atomic" - }, - "observedGeneration": { - "description": "observedGeneration is the last generation change you've dealt with", - "type": "integer", - "format": "int64" - }, - "readyReplicas": { - "description": "readyReplicas indicates how many replicas are ready and at the desired state", - "type": "integer", - "format": "int32", - "default": 0 - }, - "version": { - "description": "version is the level this availability applies to", - "type": "string" - } - }, - "x-fabric8-info": { - "Type": "nested", - "Group": "servicecertsigner.config.openshift.io", - "Version": "v1alpha1", - "Kind": "ServiceCertSignerOperatorConfigStatus", - "Scope": "Namespaced" - } - }, "io.openshift.sharedresource.v1alpha1.SharedConfigMap": { "description": "SharedConfigMap allows a ConfigMap to be shared across namespaces. Pods can mount the shared ConfigMap by adding a CSI volume to the pod specification using the \"csi.sharedresource.openshift.io\" CSI driver and a reference to the SharedConfigMap in the volume attributes:\n\nspec:\n volumes:\n - name: shared-configmap\n csi:\n driver: csi.sharedresource.openshift.io\n volumeAttributes:\n sharedConfigMap: my-share\n\nFor the mount to be successful, the pod's service account must be granted permission to 'use' the named SharedConfigMap object within its namespace with an appropriate Role and RoleBinding. For compactness, here are example `oc` invocations for creating such Role and RoleBinding objects.\n\n `oc create role shared-resource-my-share --verb=use --resource=sharedconfigmaps.sharedresource.openshift.io --resource-name=my-share`\n `oc create rolebinding shared-resource-my-share --role=shared-resource-my-share --serviceaccount=my-namespace:default`\n\nShared resource objects, in this case ConfigMaps, have default permissions of list, get, and watch for system authenticated users.\n\nCompatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support. These capabilities should not be used by applications needing long term support.", "type": "object", diff --git a/kubernetes-model-generator/openshift-model-config/pom.xml b/kubernetes-model-generator/openshift-model-config/pom.xml index 3d1a0515c5b..a3d9fb8518a 100644 --- a/kubernetes-model-generator/openshift-model-config/pom.xml +++ b/kubernetes-model-generator/openshift-model-config/pom.xml @@ -71,6 +71,11 @@ ^io\.openshift\.config\.v1alpha1\..*$ + ^io\.openshift\.config\.kubecontrolplane\..*$ + ^io\.openshift\.config\.legacy\..*$ + ^io\.openshift\.config\.openshiftcontrolplane\..*$ + ^io\.openshift\.config\.osin\..*$ + ^io\.openshift\.config\.servicecertsigner\..*$ diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpec.java index 986fcf15fb3..9eee6e5df72 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpec.java @@ -36,6 +36,7 @@ "additionalTrustedCA", "allowedRegistriesForImport", "externalRegistryHostnames", + "imageStreamImportMode", "registrySources" }) @ToString @@ -67,6 +68,8 @@ public class ImageSpec implements Editable , KubernetesResourc @JsonProperty("externalRegistryHostnames") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List externalRegistryHostnames = new ArrayList<>(); + @JsonProperty("imageStreamImportMode") + private String imageStreamImportMode; @JsonProperty("registrySources") private RegistrySources registrySources; @JsonIgnore @@ -79,11 +82,12 @@ public class ImageSpec implements Editable , KubernetesResourc public ImageSpec() { } - public ImageSpec(ConfigMapNameReference additionalTrustedCA, List allowedRegistriesForImport, List externalRegistryHostnames, RegistrySources registrySources) { + public ImageSpec(ConfigMapNameReference additionalTrustedCA, List allowedRegistriesForImport, List externalRegistryHostnames, String imageStreamImportMode, RegistrySources registrySources) { super(); this.additionalTrustedCA = additionalTrustedCA; this.allowedRegistriesForImport = allowedRegistriesForImport; this.externalRegistryHostnames = externalRegistryHostnames; + this.imageStreamImportMode = imageStreamImportMode; this.registrySources = registrySources; } @@ -119,6 +123,16 @@ public void setExternalRegistryHostnames(List externalRegistryHostnames) this.externalRegistryHostnames = externalRegistryHostnames; } + @JsonProperty("imageStreamImportMode") + public String getImageStreamImportMode() { + return imageStreamImportMode; + } + + @JsonProperty("imageStreamImportMode") + public void setImageStreamImportMode(String imageStreamImportMode) { + this.imageStreamImportMode = imageStreamImportMode; + } + @JsonProperty("registrySources") public RegistrySources getRegistrySources() { return registrySources; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageStatus.java index aee184b2950..33eef85b376 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageStatus.java @@ -34,6 +34,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "externalRegistryHostnames", + "imageStreamImportMode", "internalRegistryHostname" }) @ToString @@ -60,6 +61,8 @@ public class ImageStatus implements Editable , KubernetesRes @JsonProperty("externalRegistryHostnames") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List externalRegistryHostnames = new ArrayList<>(); + @JsonProperty("imageStreamImportMode") + private String imageStreamImportMode; @JsonProperty("internalRegistryHostname") private String internalRegistryHostname; @JsonIgnore @@ -72,9 +75,10 @@ public class ImageStatus implements Editable , KubernetesRes public ImageStatus() { } - public ImageStatus(List externalRegistryHostnames, String internalRegistryHostname) { + public ImageStatus(List externalRegistryHostnames, String imageStreamImportMode, String internalRegistryHostname) { super(); this.externalRegistryHostnames = externalRegistryHostnames; + this.imageStreamImportMode = imageStreamImportMode; this.internalRegistryHostname = internalRegistryHostname; } @@ -89,6 +93,16 @@ public void setExternalRegistryHostnames(List externalRegistryHostnames) this.externalRegistryHostnames = externalRegistryHostnames; } + @JsonProperty("imageStreamImportMode") + public String getImageStreamImportMode() { + return imageStreamImportMode; + } + + @JsonProperty("imageStreamImportMode") + public void setImageStreamImportMode(String imageStreamImportMode) { + this.imageStreamImportMode = imageStreamImportMode; + } + @JsonProperty("internalRegistryHostname") public String getInternalRegistryHostname() { return internalRegistryHostname; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java index 74972119110..0f537a3ba24 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java @@ -1,16 +1,20 @@ package io.fabric8.openshift.api.model.config.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -30,7 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - + "conditions" }) @ToString @EqualsAndHashCode @@ -53,9 +57,35 @@ public class NodeStatus implements Editable , KubernetesResource { + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); + /** + * No args constructor for use in serialization + * + */ + public NodeStatus() { + } + + public NodeStatus(List conditions) { + super(); + this.conditions = conditions; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + @JsonIgnore public NodeStatusBuilder edit() { return new NodeStatusBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-operator/pom.xml b/kubernetes-model-generator/openshift-model-operator/pom.xml index 576b27d45b6..30d319c353d 100644 --- a/kubernetes-model-generator/openshift-model-operator/pom.xml +++ b/kubernetes-model-generator/openshift-model-operator/pom.xml @@ -48,6 +48,10 @@ io.fabric8 kubernetes-model-admissionregistration + + io.fabric8 + openshift-model-config + @@ -61,22 +65,19 @@ - ${openapi.schema.openshift-latest} + ${openapi.schema.openshift-generated} + ${project.basedir}/../openapi/schemas/openshift-cluster-network-operator.json - io.fabric8.kubernetes.api.model - io.fabric8.openshift.api.model.operator - io.fabric8.openshift.api.model.operatoringress + io.fabric8.openshift.api.model.operator.network ^io\.openshift\.operator\..*$ + ^com\.github\.openshift\.cluster-network-operator\..*$ ^io\.openshift\.operator\.samples\..*$ - - io.fabric8.kubernetes.api.model.LabelSelectorRequirement - diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusFailures.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java similarity index 79% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusFailures.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java index 6266b8771e2..8120c321a7c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusFailures.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java @@ -55,12 +55,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class PodNetworkConnectivityCheckStatusFailures implements Editable , KubernetesResource +public class LogEntry implements Editable , KubernetesResource { @JsonProperty("latency") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object latency; + private String latency; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -68,8 +67,7 @@ public class PodNetworkConnectivityCheckStatusFailures implements Editable additionalProperties = new LinkedHashMap(); @@ -77,10 +75,10 @@ public class PodNetworkConnectivityCheckStatusFailures implements Editable , KubernetesResource +public class OutageEntry implements Editable , KubernetesResource { @JsonProperty("end") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object end; + private String end; @JsonProperty("endLogs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List endLogs = new ArrayList<>(); + private List endLogs = new ArrayList<>(); @JsonProperty("message") private String message; @JsonProperty("start") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object start; + private String start; @JsonProperty("startLogs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List startLogs = new ArrayList<>(); + private List startLogs = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,10 +79,10 @@ public class PodNetworkConnectivityCheckStatusOutages implements Editable endLogs, String message, Object start, List startLogs) { + public OutageEntry(String end, List endLogs, String message, String start, List startLogs) { super(); this.end = end; this.endLogs = endLogs; @@ -94,24 +92,23 @@ public PodNetworkConnectivityCheckStatusOutages(Object end, List getEndLogs() { + public List getEndLogs() { return endLogs; } @JsonProperty("endLogs") - public void setEndLogs(List endLogs) { + public void setEndLogs(List endLogs) { this.endLogs = endLogs; } @@ -126,34 +123,33 @@ public void setMessage(String message) { } @JsonProperty("start") - public Object getStart() { + public String getStart() { return start; } @JsonProperty("start") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStart(Object start) { + public void setStart(String start) { this.start = start; } @JsonProperty("startLogs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getStartLogs() { + public List getStartLogs() { return startLogs; } @JsonProperty("startLogs") - public void setStartLogs(List startLogs) { + public void setStartLogs(List startLogs) { this.startLogs = startLogs; } @JsonIgnore - public PodNetworkConnectivityCheckStatusOutagesBuilder edit() { - return new PodNetworkConnectivityCheckStatusOutagesBuilder(this); + public OutageEntryBuilder edit() { + return new OutageEntryBuilder(this); } @JsonIgnore - public PodNetworkConnectivityCheckStatusOutagesBuilder toBuilder() { + public OutageEntryBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java similarity index 88% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java index 844723302d0..807481a05c8 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.imageregistry.v1; +package io.fabric8.openshift.api.model.operator.controlplane.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusConditions implements Editable , KubernetesResource +public class PodNetworkConnectivityCheckCondition implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class ConfigStatusConditions implements Editable additionalProperties = new LinkedHashMap(); @@ -72,7 +73,7 @@ public class PodNetworkConnectivityCheckSpec implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public PodNetworkConnectivityCheckSpecTlsClientCert() { - } - - public PodNetworkConnectivityCheckSpecTlsClientCert(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public PodNetworkConnectivityCheckSpecTlsClientCertBuilder edit() { - return new PodNetworkConnectivityCheckSpecTlsClientCertBuilder(this); - } - - @JsonIgnore - public PodNetworkConnectivityCheckSpecTlsClientCertBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatus.java index 784a73764e5..88207c94700 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatus.java @@ -61,16 +61,16 @@ public class PodNetworkConnectivityCheckStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("failures") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List failures = new ArrayList<>(); + private List failures = new ArrayList<>(); @JsonProperty("outages") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List outages = new ArrayList<>(); + private List outages = new ArrayList<>(); @JsonProperty("successes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List successes = new ArrayList<>(); + private List successes = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,7 +81,7 @@ public class PodNetworkConnectivityCheckStatus implements Editable conditions, List failures, List outages, List successes) { + public PodNetworkConnectivityCheckStatus(List conditions, List failures, List outages, List successes) { super(); this.conditions = conditions; this.failures = failures; @@ -91,45 +91,45 @@ public PodNetworkConnectivityCheckStatus(List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("failures") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFailures() { + public List getFailures() { return failures; } @JsonProperty("failures") - public void setFailures(List failures) { + public void setFailures(List failures) { this.failures = failures; } @JsonProperty("outages") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getOutages() { + public List getOutages() { return outages; } @JsonProperty("outages") - public void setOutages(List outages) { + public void setOutages(List outages) { this.outages = outages; } @JsonProperty("successes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSuccesses() { + public List getSuccesses() { return successes; } @JsonProperty("successes") - public void setSuccesses(List successes) { + public void setSuccesses(List successes) { this.successes = successes; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusConditions.java deleted file mode 100644 index 462da3fab79..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusConditions.java +++ /dev/null @@ -1,166 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.controlplane.v1alpha1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class PodNetworkConnectivityCheckStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public PodNetworkConnectivityCheckStatusConditions() { - } - - public PodNetworkConnectivityCheckStatusConditions(Object lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public Object getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setLastTransitionTime(Object lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public PodNetworkConnectivityCheckStatusConditionsBuilder edit() { - return new PodNetworkConnectivityCheckStatusConditionsBuilder(this); - } - - @JsonIgnore - public PodNetworkConnectivityCheckStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusOStartLogs.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusOStartLogs.java deleted file mode 100644 index a864d09f1fe..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusOStartLogs.java +++ /dev/null @@ -1,168 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.controlplane.v1alpha1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "latency", - "message", - "reason", - "success", - "time" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class PodNetworkConnectivityCheckStatusOStartLogs implements Editable , KubernetesResource -{ - - @JsonProperty("latency") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object latency; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("success") - private Boolean success; - @JsonProperty("time") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object time; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public PodNetworkConnectivityCheckStatusOStartLogs() { - } - - public PodNetworkConnectivityCheckStatusOStartLogs(Object latency, String message, String reason, Boolean success, Object time) { - super(); - this.latency = latency; - this.message = message; - this.reason = reason; - this.success = success; - this.time = time; - } - - @JsonProperty("latency") - public Object getLatency() { - return latency; - } - - @JsonProperty("latency") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setLatency(Object latency) { - this.latency = latency; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("success") - public Boolean getSuccess() { - return success; - } - - @JsonProperty("success") - public void setSuccess(Boolean success) { - this.success = success; - } - - @JsonProperty("time") - public Object getTime() { - return time; - } - - @JsonProperty("time") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setTime(Object time) { - this.time = time; - } - - @JsonIgnore - public PodNetworkConnectivityCheckStatusOStartLogsBuilder edit() { - return new PodNetworkConnectivityCheckStatusOStartLogsBuilder(this); - } - - @JsonIgnore - public PodNetworkConnectivityCheckStatusOStartLogsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSAzureNetworkAccess.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/AzureNetworkAccess.java similarity index 84% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSAzureNetworkAccess.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/AzureNetworkAccess.java index f2b1169a07e..d6b4a1e8aac 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSAzureNetworkAccess.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/AzureNetworkAccess.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSAzureNetworkAccess implements Editable , KubernetesResource +public class AzureNetworkAccess implements Editable , KubernetesResource { @JsonProperty("internal") - private ConfigSpecSAzureNAInternal internal; + private AzureNetworkAccessInternal internal; @JsonProperty("type") private String type; @JsonIgnore @@ -66,22 +66,22 @@ public class ConfigSpecSAzureNetworkAccess implements Editable , KubernetesResource +public class AzureNetworkAccessInternal implements Editable , KubernetesResource { @JsonProperty("networkResourceGroupName") @@ -72,10 +72,10 @@ public class ConfigSpecSAzureNAInternal implements Editable , HasMetadata @JsonProperty("metadata") private ObjectMeta metadata; @JsonProperty("spec") - private ConfigSpec spec; + private ImageRegistrySpec spec; @JsonProperty("status") - private ConfigStatus status; + private ImageRegistryStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -97,7 +97,7 @@ public class Config implements Editable , HasMetadata public Config() { } - public Config(String apiVersion, String kind, ObjectMeta metadata, ConfigSpec spec, ConfigStatus status) { + public Config(String apiVersion, String kind, ObjectMeta metadata, ImageRegistrySpec spec, ImageRegistryStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -157,22 +157,22 @@ public void setMetadata(ObjectMeta metadata) { } @JsonProperty("spec") - public ConfigSpec getSpec() { + public ImageRegistrySpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(ConfigSpec spec) { + public void setSpec(ImageRegistrySpec spec) { this.spec = spec; } @JsonProperty("status") - public ConfigStatus getStatus() { + public ImageRegistryStatus getStatus() { return status; } @JsonProperty("status") - public void setStatus(ConfigStatus status) { + public void setStatus(ImageRegistryStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPMatchExpressions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPMatchExpressions.java deleted file mode 100644 index 7d0e08ace55..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPMatchExpressions.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANAPDSIDEPMatchExpressions implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANAPDSIDEPMatchExpressions() { - } - - public ConfigSpecANAPDSIDEPMatchExpressions(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ConfigSpecANAPDSIDEPMatchExpressionsBuilder edit() { - return new ConfigSpecANAPDSIDEPMatchExpressionsBuilder(this); - } - - @JsonIgnore - public ConfigSpecANAPDSIDEPMatchExpressionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPMatchFields.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPMatchFields.java deleted file mode 100644 index 3a43c878c18..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPMatchFields.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANAPDSIDEPMatchFields implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANAPDSIDEPMatchFields() { - } - - public ConfigSpecANAPDSIDEPMatchFields(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ConfigSpecANAPDSIDEPMatchFieldsBuilder edit() { - return new ConfigSpecANAPDSIDEPMatchFieldsBuilder(this); - } - - @JsonIgnore - public ConfigSpecANAPDSIDEPMatchFieldsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPreference.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPreference.java deleted file mode 100644 index 76e4b1375cc..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPDSIDEPreference.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchFields" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANAPDSIDEPreference implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchFields = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANAPDSIDEPreference() { - } - - public ConfigSpecANAPDSIDEPreference(List matchExpressions, List matchFields) { - super(); - this.matchExpressions = matchExpressions; - this.matchFields = matchFields; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchFields() { - return matchFields; - } - - @JsonProperty("matchFields") - public void setMatchFields(List matchFields) { - this.matchFields = matchFields; - } - - @JsonIgnore - public ConfigSpecANAPDSIDEPreferenceBuilder edit() { - return new ConfigSpecANAPDSIDEPreferenceBuilder(this); - } - - @JsonIgnore - public ConfigSpecANAPDSIDEPreferenceBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 141d52787ae..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preference", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("preference") - private ConfigSpecANAPDSIDEPreference preference; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecution() { - } - - public ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecution(ConfigSpecANAPDSIDEPreference preference, Integer weight) { - super(); - this.preference = preference; - this.weight = weight; - } - - @JsonProperty("preference") - public ConfigSpecANAPDSIDEPreference getPreference() { - return preference; - } - - @JsonProperty("preference") - public void setPreference(ConfigSpecANAPDSIDEPreference preference) { - this.preference = preference; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ConfigSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENSTMatchExpressions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENSTMatchExpressions.java deleted file mode 100644 index 06f2cf50626..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENSTMatchExpressions.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANARDSIDENSTMatchExpressions implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANARDSIDENSTMatchExpressions() { - } - - public ConfigSpecANARDSIDENSTMatchExpressions(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ConfigSpecANARDSIDENSTMatchExpressionsBuilder edit() { - return new ConfigSpecANARDSIDENSTMatchExpressionsBuilder(this); - } - - @JsonIgnore - public ConfigSpecANARDSIDENSTMatchExpressionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENSTMatchFields.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENSTMatchFields.java deleted file mode 100644 index 5868d72b007..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENSTMatchFields.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANARDSIDENSTMatchFields implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANARDSIDENSTMatchFields() { - } - - public ConfigSpecANARDSIDENSTMatchFields(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ConfigSpecANARDSIDENSTMatchFieldsBuilder edit() { - return new ConfigSpecANARDSIDENSTMatchFieldsBuilder(this); - } - - @JsonIgnore - public ConfigSpecANARDSIDENSTMatchFieldsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENodeSelectorTerms.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENodeSelectorTerms.java deleted file mode 100644 index 150829c5bea..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARDSIDENodeSelectorTerms.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchFields" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANARDSIDENodeSelectorTerms implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchFields = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANARDSIDENodeSelectorTerms() { - } - - public ConfigSpecANARDSIDENodeSelectorTerms(List matchExpressions, List matchFields) { - super(); - this.matchExpressions = matchExpressions; - this.matchFields = matchFields; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchFields() { - return matchFields; - } - - @JsonProperty("matchFields") - public void setMatchFields(List matchFields) { - this.matchFields = matchFields; - } - - @JsonIgnore - public ConfigSpecANARDSIDENodeSelectorTermsBuilder edit() { - return new ConfigSpecANARDSIDENodeSelectorTermsBuilder(this); - } - - @JsonIgnore - public ConfigSpecANARDSIDENodeSelectorTermsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 6e36020ba69..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,112 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "nodeSelectorTerms" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("nodeSelectorTerms") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nodeSelectorTerms = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution() { - } - - public ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution(List nodeSelectorTerms) { - super(); - this.nodeSelectorTerms = nodeSelectorTerms; - } - - @JsonProperty("nodeSelectorTerms") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNodeSelectorTerms() { - return nodeSelectorTerms; - } - - @JsonProperty("nodeSelectorTerms") - public void setNodeSelectorTerms(List nodeSelectorTerms) { - this.nodeSelectorTerms = nodeSelectorTerms; - } - - @JsonIgnore - public ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANodeAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANodeAffinity.java deleted file mode 100644 index 7c005b4ff9d..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecANodeAffinity.java +++ /dev/null @@ -1,126 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preferredDuringSchedulingIgnoredDuringExecution", - "requiredDuringSchedulingIgnoredDuringExecution" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecANodeAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - private ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecANodeAffinity() { - } - - public ConfigSpecANodeAffinity(List preferredDuringSchedulingIgnoredDuringExecution, ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) { - super(); - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreferredDuringSchedulingIgnoredDuringExecution() { - return preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - public void setPreferredDuringSchedulingIgnoredDuringExecution(List preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution getRequiredDuringSchedulingIgnoredDuringExecution() { - return requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public void setRequiredDuringSchedulingIgnoredDuringExecution(ConfigSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonIgnore - public ConfigSpecANodeAffinityBuilder edit() { - return new ConfigSpecANodeAffinityBuilder(this); - } - - @JsonIgnore - public ConfigSpecANodeAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPATLabelSelector.java deleted file mode 100644 index 8a795778b5a..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPATLabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAAPDSIDEPATLabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAAPDSIDEPATLabelSelector() { - } - - public ConfigSpecAPAAPDSIDEPATLabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPAAPDSIDEPATLabelSelectorBuilder edit() { - return new ConfigSpecAPAAPDSIDEPATLabelSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAAPDSIDEPATLabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPATNamespaceSelector.java deleted file mode 100644 index e38c48b5bb6..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPATNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAAPDSIDEPATNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAAPDSIDEPATNamespaceSelector() { - } - - public ConfigSpecAPAAPDSIDEPATNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPAAPDSIDEPATNamespaceSelectorBuilder edit() { - return new ConfigSpecAPAAPDSIDEPATNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAAPDSIDEPATNamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPodAffinityTerm.java deleted file mode 100644 index 897e3b001dd..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPDSIDEPodAffinityTerm.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAAPDSIDEPodAffinityTerm implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ConfigSpecAPAAPDSIDEPATLabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ConfigSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAAPDSIDEPodAffinityTerm() { - } - - public ConfigSpecAPAAPDSIDEPodAffinityTerm(ConfigSpecAPAAPDSIDEPATLabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ConfigSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ConfigSpecAPAAPDSIDEPATLabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ConfigSpecAPAAPDSIDEPATLabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ConfigSpecAPAAPDSIDEPATNamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ConfigSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ConfigSpecAPAAPDSIDEPodAffinityTermBuilder edit() { - return new ConfigSpecAPAAPDSIDEPodAffinityTermBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAAPDSIDEPodAffinityTermBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 9d0ad44d3fc..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "podAffinityTerm", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("podAffinityTerm") - private ConfigSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution() { - } - - public ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution(ConfigSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) { - super(); - this.podAffinityTerm = podAffinityTerm; - this.weight = weight; - } - - @JsonProperty("podAffinityTerm") - public ConfigSpecAPAAPDSIDEPodAffinityTerm getPodAffinityTerm() { - return podAffinityTerm; - } - - @JsonProperty("podAffinityTerm") - public void setPodAffinityTerm(ConfigSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm) { - this.podAffinityTerm = podAffinityTerm; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARDSIDELabelSelector.java deleted file mode 100644 index 5ce307dc957..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARDSIDELabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAARDSIDELabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAARDSIDELabelSelector() { - } - - public ConfigSpecAPAARDSIDELabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPAARDSIDELabelSelectorBuilder edit() { - return new ConfigSpecAPAARDSIDELabelSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAARDSIDELabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARDSIDENamespaceSelector.java deleted file mode 100644 index 89771f389a9..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARDSIDENamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAARDSIDENamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAARDSIDENamespaceSelector() { - } - - public ConfigSpecAPAARDSIDENamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPAARDSIDENamespaceSelectorBuilder edit() { - return new ConfigSpecAPAARDSIDENamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAARDSIDENamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 944a2482aaa..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ConfigSpecAPAARDSIDELabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ConfigSpecAPAARDSIDENamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecution() { - } - - public ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecution(ConfigSpecAPAARDSIDELabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ConfigSpecAPAARDSIDENamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ConfigSpecAPAARDSIDELabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ConfigSpecAPAARDSIDELabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ConfigSpecAPAARDSIDENamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ConfigSpecAPAARDSIDENamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPATLabelSelector.java deleted file mode 100644 index e90ab85ed3d..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPATLabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAPDSIDEPATLabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAPDSIDEPATLabelSelector() { - } - - public ConfigSpecAPAPDSIDEPATLabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPAPDSIDEPATLabelSelectorBuilder edit() { - return new ConfigSpecAPAPDSIDEPATLabelSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAPDSIDEPATLabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPATNamespaceSelector.java deleted file mode 100644 index 1b50880c96a..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPATNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAPDSIDEPATNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAPDSIDEPATNamespaceSelector() { - } - - public ConfigSpecAPAPDSIDEPATNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPAPDSIDEPATNamespaceSelectorBuilder edit() { - return new ConfigSpecAPAPDSIDEPATNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAPDSIDEPATNamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPodAffinityTerm.java deleted file mode 100644 index e969cf4bb1f..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPDSIDEPodAffinityTerm.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAPDSIDEPodAffinityTerm implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ConfigSpecAPAPDSIDEPATLabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ConfigSpecAPAPDSIDEPATNamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAPDSIDEPodAffinityTerm() { - } - - public ConfigSpecAPAPDSIDEPodAffinityTerm(ConfigSpecAPAPDSIDEPATLabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ConfigSpecAPAPDSIDEPATNamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ConfigSpecAPAPDSIDEPATLabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ConfigSpecAPAPDSIDEPATLabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ConfigSpecAPAPDSIDEPATNamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ConfigSpecAPAPDSIDEPATNamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ConfigSpecAPAPDSIDEPodAffinityTermBuilder edit() { - return new ConfigSpecAPAPDSIDEPodAffinityTermBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAPDSIDEPodAffinityTermBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 631f1e2b2cf..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "podAffinityTerm", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("podAffinityTerm") - private ConfigSpecAPAPDSIDEPodAffinityTerm podAffinityTerm; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecution() { - } - - public ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecution(ConfigSpecAPAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) { - super(); - this.podAffinityTerm = podAffinityTerm; - this.weight = weight; - } - - @JsonProperty("podAffinityTerm") - public ConfigSpecAPAPDSIDEPodAffinityTerm getPodAffinityTerm() { - return podAffinityTerm; - } - - @JsonProperty("podAffinityTerm") - public void setPodAffinityTerm(ConfigSpecAPAPDSIDEPodAffinityTerm podAffinityTerm) { - this.podAffinityTerm = podAffinityTerm; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARDSIDELabelSelector.java deleted file mode 100644 index f7f50d09900..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARDSIDELabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPARDSIDELabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPARDSIDELabelSelector() { - } - - public ConfigSpecAPARDSIDELabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPARDSIDELabelSelectorBuilder edit() { - return new ConfigSpecAPARDSIDELabelSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPARDSIDELabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARDSIDENamespaceSelector.java deleted file mode 100644 index 8c1f41a90df..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARDSIDENamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPARDSIDENamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPARDSIDENamespaceSelector() { - } - - public ConfigSpecAPARDSIDENamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecAPARDSIDENamespaceSelectorBuilder edit() { - return new ConfigSpecAPARDSIDENamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPARDSIDENamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 4d39c844acb..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ConfigSpecAPARDSIDELabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ConfigSpecAPARDSIDENamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecution() { - } - - public ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecution(ConfigSpecAPARDSIDELabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ConfigSpecAPARDSIDENamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ConfigSpecAPARDSIDELabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ConfigSpecAPARDSIDELabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ConfigSpecAPARDSIDENamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ConfigSpecAPARDSIDENamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPodAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPodAffinity.java deleted file mode 100644 index 400d005d8c0..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAPodAffinity.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preferredDuringSchedulingIgnoredDuringExecution", - "requiredDuringSchedulingIgnoredDuringExecution" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAPodAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAPodAffinity() { - } - - public ConfigSpecAPodAffinity(List preferredDuringSchedulingIgnoredDuringExecution, List requiredDuringSchedulingIgnoredDuringExecution) { - super(); - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreferredDuringSchedulingIgnoredDuringExecution() { - return preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - public void setPreferredDuringSchedulingIgnoredDuringExecution(List preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRequiredDuringSchedulingIgnoredDuringExecution() { - return requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public void setRequiredDuringSchedulingIgnoredDuringExecution(List requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonIgnore - public ConfigSpecAPodAffinityBuilder edit() { - return new ConfigSpecAPodAffinityBuilder(this); - } - - @JsonIgnore - public ConfigSpecAPodAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAffinity.java deleted file mode 100644 index c98e1f2ab05..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecAffinity.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "nodeAffinity", - "podAffinity", - "podAntiAffinity" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("nodeAffinity") - private ConfigSpecANodeAffinity nodeAffinity; - @JsonProperty("podAffinity") - private ConfigSpecAPodAffinity podAffinity; - @JsonProperty("podAntiAffinity") - private ConfigSpecAPodAntiAffinity podAntiAffinity; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecAffinity() { - } - - public ConfigSpecAffinity(ConfigSpecANodeAffinity nodeAffinity, ConfigSpecAPodAffinity podAffinity, ConfigSpecAPodAntiAffinity podAntiAffinity) { - super(); - this.nodeAffinity = nodeAffinity; - this.podAffinity = podAffinity; - this.podAntiAffinity = podAntiAffinity; - } - - @JsonProperty("nodeAffinity") - public ConfigSpecANodeAffinity getNodeAffinity() { - return nodeAffinity; - } - - @JsonProperty("nodeAffinity") - public void setNodeAffinity(ConfigSpecANodeAffinity nodeAffinity) { - this.nodeAffinity = nodeAffinity; - } - - @JsonProperty("podAffinity") - public ConfigSpecAPodAffinity getPodAffinity() { - return podAffinity; - } - - @JsonProperty("podAffinity") - public void setPodAffinity(ConfigSpecAPodAffinity podAffinity) { - this.podAffinity = podAffinity; - } - - @JsonProperty("podAntiAffinity") - public ConfigSpecAPodAntiAffinity getPodAntiAffinity() { - return podAntiAffinity; - } - - @JsonProperty("podAntiAffinity") - public void setPodAntiAffinity(ConfigSpecAPodAntiAffinity podAntiAffinity) { - this.podAntiAffinity = podAntiAffinity; - } - - @JsonIgnore - public ConfigSpecAffinityBuilder edit() { - return new ConfigSpecAffinityBuilder(this); - } - - @JsonIgnore - public ConfigSpecAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRWrite.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRWrite.java deleted file mode 100644 index 4fdea17b89e..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRWrite.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "maxInQueue", - "maxRunning", - "maxWaitInQueue" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecRWrite implements Editable , KubernetesResource -{ - - @JsonProperty("maxInQueue") - private Integer maxInQueue; - @JsonProperty("maxRunning") - private Integer maxRunning; - @JsonProperty("maxWaitInQueue") - private String maxWaitInQueue; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecRWrite() { - } - - public ConfigSpecRWrite(Integer maxInQueue, Integer maxRunning, String maxWaitInQueue) { - super(); - this.maxInQueue = maxInQueue; - this.maxRunning = maxRunning; - this.maxWaitInQueue = maxWaitInQueue; - } - - @JsonProperty("maxInQueue") - public Integer getMaxInQueue() { - return maxInQueue; - } - - @JsonProperty("maxInQueue") - public void setMaxInQueue(Integer maxInQueue) { - this.maxInQueue = maxInQueue; - } - - @JsonProperty("maxRunning") - public Integer getMaxRunning() { - return maxRunning; - } - - @JsonProperty("maxRunning") - public void setMaxRunning(Integer maxRunning) { - this.maxRunning = maxRunning; - } - - @JsonProperty("maxWaitInQueue") - public String getMaxWaitInQueue() { - return maxWaitInQueue; - } - - @JsonProperty("maxWaitInQueue") - public void setMaxWaitInQueue(String maxWaitInQueue) { - this.maxWaitInQueue = maxWaitInQueue; - } - - @JsonIgnore - public ConfigSpecRWriteBuilder edit() { - return new ConfigSpecRWriteBuilder(this); - } - - @JsonIgnore - public ConfigSpecRWriteBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSAzure.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSAzure.java deleted file mode 100644 index 84319ecdf92..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSAzure.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "accountName", - "cloudName", - "container", - "networkAccess" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecSAzure implements Editable , KubernetesResource -{ - - @JsonProperty("accountName") - private String accountName; - @JsonProperty("cloudName") - private String cloudName; - @JsonProperty("container") - private String container; - @JsonProperty("networkAccess") - private ConfigSpecSAzureNetworkAccess networkAccess; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecSAzure() { - } - - public ConfigSpecSAzure(String accountName, String cloudName, String container, ConfigSpecSAzureNetworkAccess networkAccess) { - super(); - this.accountName = accountName; - this.cloudName = cloudName; - this.container = container; - this.networkAccess = networkAccess; - } - - @JsonProperty("accountName") - public String getAccountName() { - return accountName; - } - - @JsonProperty("accountName") - public void setAccountName(String accountName) { - this.accountName = accountName; - } - - @JsonProperty("cloudName") - public String getCloudName() { - return cloudName; - } - - @JsonProperty("cloudName") - public void setCloudName(String cloudName) { - this.cloudName = cloudName; - } - - @JsonProperty("container") - public String getContainer() { - return container; - } - - @JsonProperty("container") - public void setContainer(String container) { - this.container = container; - } - - @JsonProperty("networkAccess") - public ConfigSpecSAzureNetworkAccess getNetworkAccess() { - return networkAccess; - } - - @JsonProperty("networkAccess") - public void setNetworkAccess(ConfigSpecSAzureNetworkAccess networkAccess) { - this.networkAccess = networkAccess; - } - - @JsonIgnore - public ConfigSpecSAzureBuilder edit() { - return new ConfigSpecSAzureBuilder(this); - } - - @JsonIgnore - public ConfigSpecSAzureBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOss.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOss.java deleted file mode 100644 index a9cde7d28ce..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOss.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "encryption", - "endpointAccessibility", - "region" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecSOss implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("encryption") - private ConfigSpecSOEncryption encryption; - @JsonProperty("endpointAccessibility") - private String endpointAccessibility; - @JsonProperty("region") - private String region; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecSOss() { - } - - public ConfigSpecSOss(String bucket, ConfigSpecSOEncryption encryption, String endpointAccessibility, String region) { - super(); - this.bucket = bucket; - this.encryption = encryption; - this.endpointAccessibility = endpointAccessibility; - this.region = region; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("encryption") - public ConfigSpecSOEncryption getEncryption() { - return encryption; - } - - @JsonProperty("encryption") - public void setEncryption(ConfigSpecSOEncryption encryption) { - this.encryption = encryption; - } - - @JsonProperty("endpointAccessibility") - public String getEndpointAccessibility() { - return endpointAccessibility; - } - - @JsonProperty("endpointAccessibility") - public void setEndpointAccessibility(String endpointAccessibility) { - this.endpointAccessibility = endpointAccessibility; - } - - @JsonProperty("region") - public String getRegion() { - return region; - } - - @JsonProperty("region") - public void setRegion(String region) { - this.region = region; - } - - @JsonIgnore - public ConfigSpecSOssBuilder edit() { - return new ConfigSpecSOssBuilder(this); - } - - @JsonIgnore - public ConfigSpecSOssBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSCFPrivateKey.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSCFPrivateKey.java deleted file mode 100644 index d25948763a6..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSCFPrivateKey.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "name", - "optional" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecSSCFPrivateKey implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("name") - private String name; - @JsonProperty("optional") - private Boolean optional; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecSSCFPrivateKey() { - } - - public ConfigSpecSSCFPrivateKey(String key, String name, Boolean optional) { - super(); - this.key = key; - this.name = name; - this.optional = optional; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonProperty("optional") - public Boolean getOptional() { - return optional; - } - - @JsonProperty("optional") - public void setOptional(Boolean optional) { - this.optional = optional; - } - - @JsonIgnore - public ConfigSpecSSCFPrivateKeyBuilder edit() { - return new ConfigSpecSSCFPrivateKeyBuilder(this); - } - - @JsonIgnore - public ConfigSpecSSCFPrivateKeyBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSwift.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSwift.java deleted file mode 100644 index 1d98e937c55..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSwift.java +++ /dev/null @@ -1,206 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "authURL", - "authVersion", - "container", - "domain", - "domainID", - "regionName", - "tenant", - "tenantID" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecSSwift implements Editable , KubernetesResource -{ - - @JsonProperty("authURL") - private String authURL; - @JsonProperty("authVersion") - private String authVersion; - @JsonProperty("container") - private String container; - @JsonProperty("domain") - private String domain; - @JsonProperty("domainID") - private String domainID; - @JsonProperty("regionName") - private String regionName; - @JsonProperty("tenant") - private String tenant; - @JsonProperty("tenantID") - private String tenantID; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecSSwift() { - } - - public ConfigSpecSSwift(String authURL, String authVersion, String container, String domain, String domainID, String regionName, String tenant, String tenantID) { - super(); - this.authURL = authURL; - this.authVersion = authVersion; - this.container = container; - this.domain = domain; - this.domainID = domainID; - this.regionName = regionName; - this.tenant = tenant; - this.tenantID = tenantID; - } - - @JsonProperty("authURL") - public String getAuthURL() { - return authURL; - } - - @JsonProperty("authURL") - public void setAuthURL(String authURL) { - this.authURL = authURL; - } - - @JsonProperty("authVersion") - public String getAuthVersion() { - return authVersion; - } - - @JsonProperty("authVersion") - public void setAuthVersion(String authVersion) { - this.authVersion = authVersion; - } - - @JsonProperty("container") - public String getContainer() { - return container; - } - - @JsonProperty("container") - public void setContainer(String container) { - this.container = container; - } - - @JsonProperty("domain") - public String getDomain() { - return domain; - } - - @JsonProperty("domain") - public void setDomain(String domain) { - this.domain = domain; - } - - @JsonProperty("domainID") - public String getDomainID() { - return domainID; - } - - @JsonProperty("domainID") - public void setDomainID(String domainID) { - this.domainID = domainID; - } - - @JsonProperty("regionName") - public String getRegionName() { - return regionName; - } - - @JsonProperty("regionName") - public void setRegionName(String regionName) { - this.regionName = regionName; - } - - @JsonProperty("tenant") - public String getTenant() { - return tenant; - } - - @JsonProperty("tenant") - public void setTenant(String tenant) { - this.tenant = tenant; - } - - @JsonProperty("tenantID") - public String getTenantID() { - return tenantID; - } - - @JsonProperty("tenantID") - public void setTenantID(String tenantID) { - this.tenantID = tenantID; - } - - @JsonIgnore - public ConfigSpecSSwiftBuilder edit() { - return new ConfigSpecSSwiftBuilder(this); - } - - @JsonIgnore - public ConfigSpecSSwiftBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecStorage.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecStorage.java deleted file mode 100644 index cbec392715e..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecStorage.java +++ /dev/null @@ -1,222 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "azure", - "emptyDir", - "gcs", - "ibmcos", - "managementState", - "oss", - "pvc", - "s3", - "swift" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecStorage implements Editable , KubernetesResource -{ - - @JsonProperty("azure") - private ConfigSpecSAzure azure; - @JsonProperty("emptyDir") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object emptyDir; - @JsonProperty("gcs") - private ConfigSpecSGcs gcs; - @JsonProperty("ibmcos") - private ConfigSpecSIbmcos ibmcos; - @JsonProperty("managementState") - private String managementState; - @JsonProperty("oss") - private ConfigSpecSOss oss; - @JsonProperty("pvc") - private ConfigSpecSPvc pvc; - @JsonProperty("s3") - private ConfigSpecSS3 s3; - @JsonProperty("swift") - private ConfigSpecSSwift swift; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecStorage() { - } - - public ConfigSpecStorage(ConfigSpecSAzure azure, Object emptyDir, ConfigSpecSGcs gcs, ConfigSpecSIbmcos ibmcos, String managementState, ConfigSpecSOss oss, ConfigSpecSPvc pvc, ConfigSpecSS3 s3, ConfigSpecSSwift swift) { - super(); - this.azure = azure; - this.emptyDir = emptyDir; - this.gcs = gcs; - this.ibmcos = ibmcos; - this.managementState = managementState; - this.oss = oss; - this.pvc = pvc; - this.s3 = s3; - this.swift = swift; - } - - @JsonProperty("azure") - public ConfigSpecSAzure getAzure() { - return azure; - } - - @JsonProperty("azure") - public void setAzure(ConfigSpecSAzure azure) { - this.azure = azure; - } - - @JsonProperty("emptyDir") - public Object getEmptyDir() { - return emptyDir; - } - - @JsonProperty("emptyDir") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setEmptyDir(Object emptyDir) { - this.emptyDir = emptyDir; - } - - @JsonProperty("gcs") - public ConfigSpecSGcs getGcs() { - return gcs; - } - - @JsonProperty("gcs") - public void setGcs(ConfigSpecSGcs gcs) { - this.gcs = gcs; - } - - @JsonProperty("ibmcos") - public ConfigSpecSIbmcos getIbmcos() { - return ibmcos; - } - - @JsonProperty("ibmcos") - public void setIbmcos(ConfigSpecSIbmcos ibmcos) { - this.ibmcos = ibmcos; - } - - @JsonProperty("managementState") - public String getManagementState() { - return managementState; - } - - @JsonProperty("managementState") - public void setManagementState(String managementState) { - this.managementState = managementState; - } - - @JsonProperty("oss") - public ConfigSpecSOss getOss() { - return oss; - } - - @JsonProperty("oss") - public void setOss(ConfigSpecSOss oss) { - this.oss = oss; - } - - @JsonProperty("pvc") - public ConfigSpecSPvc getPvc() { - return pvc; - } - - @JsonProperty("pvc") - public void setPvc(ConfigSpecSPvc pvc) { - this.pvc = pvc; - } - - @JsonProperty("s3") - public ConfigSpecSS3 getS3() { - return s3; - } - - @JsonProperty("s3") - public void setS3(ConfigSpecSS3 s3) { - this.s3 = s3; - } - - @JsonProperty("swift") - public ConfigSpecSSwift getSwift() { - return swift; - } - - @JsonProperty("swift") - public void setSwift(ConfigSpecSSwift swift) { - this.swift = swift; - } - - @JsonIgnore - public ConfigSpecStorageBuilder edit() { - return new ConfigSpecStorageBuilder(this); - } - - @JsonIgnore - public ConfigSpecStorageBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTSCLabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTSCLabelSelector.java deleted file mode 100644 index 2fbbce7c26a..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTSCLabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecTSCLabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecTSCLabelSelector() { - } - - public ConfigSpecTSCLabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ConfigSpecTSCLabelSelectorBuilder edit() { - return new ConfigSpecTSCLabelSelectorBuilder(this); - } - - @JsonIgnore - public ConfigSpecTSCLabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTolerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTolerations.java deleted file mode 100644 index bb5d595c8a3..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecTolerations() { - } - - public ConfigSpecTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public ConfigSpecTolerationsBuilder edit() { - return new ConfigSpecTolerationsBuilder(this); - } - - @JsonIgnore - public ConfigSpecTolerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTopologySpreadConstraints.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTopologySpreadConstraints.java deleted file mode 100644 index 74c09b37ce8..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecTopologySpreadConstraints.java +++ /dev/null @@ -1,210 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "maxSkew", - "minDomains", - "nodeAffinityPolicy", - "nodeTaintsPolicy", - "topologyKey", - "whenUnsatisfiable" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigSpecTopologySpreadConstraints implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ConfigSpecTSCLabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("maxSkew") - private Integer maxSkew; - @JsonProperty("minDomains") - private Integer minDomains; - @JsonProperty("nodeAffinityPolicy") - private String nodeAffinityPolicy; - @JsonProperty("nodeTaintsPolicy") - private String nodeTaintsPolicy; - @JsonProperty("topologyKey") - private String topologyKey; - @JsonProperty("whenUnsatisfiable") - private String whenUnsatisfiable; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigSpecTopologySpreadConstraints() { - } - - public ConfigSpecTopologySpreadConstraints(ConfigSpecTSCLabelSelector labelSelector, List matchLabelKeys, Integer maxSkew, Integer minDomains, String nodeAffinityPolicy, String nodeTaintsPolicy, String topologyKey, String whenUnsatisfiable) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.maxSkew = maxSkew; - this.minDomains = minDomains; - this.nodeAffinityPolicy = nodeAffinityPolicy; - this.nodeTaintsPolicy = nodeTaintsPolicy; - this.topologyKey = topologyKey; - this.whenUnsatisfiable = whenUnsatisfiable; - } - - @JsonProperty("labelSelector") - public ConfigSpecTSCLabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ConfigSpecTSCLabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("maxSkew") - public Integer getMaxSkew() { - return maxSkew; - } - - @JsonProperty("maxSkew") - public void setMaxSkew(Integer maxSkew) { - this.maxSkew = maxSkew; - } - - @JsonProperty("minDomains") - public Integer getMinDomains() { - return minDomains; - } - - @JsonProperty("minDomains") - public void setMinDomains(Integer minDomains) { - this.minDomains = minDomains; - } - - @JsonProperty("nodeAffinityPolicy") - public String getNodeAffinityPolicy() { - return nodeAffinityPolicy; - } - - @JsonProperty("nodeAffinityPolicy") - public void setNodeAffinityPolicy(String nodeAffinityPolicy) { - this.nodeAffinityPolicy = nodeAffinityPolicy; - } - - @JsonProperty("nodeTaintsPolicy") - public String getNodeTaintsPolicy() { - return nodeTaintsPolicy; - } - - @JsonProperty("nodeTaintsPolicy") - public void setNodeTaintsPolicy(String nodeTaintsPolicy) { - this.nodeTaintsPolicy = nodeTaintsPolicy; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonProperty("whenUnsatisfiable") - public String getWhenUnsatisfiable() { - return whenUnsatisfiable; - } - - @JsonProperty("whenUnsatisfiable") - public void setWhenUnsatisfiable(String whenUnsatisfiable) { - this.whenUnsatisfiable = whenUnsatisfiable; - } - - @JsonIgnore - public ConfigSpecTopologySpreadConstraintsBuilder edit() { - return new ConfigSpecTopologySpreadConstraintsBuilder(this); - } - - @JsonIgnore - public ConfigSpecTopologySpreadConstraintsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusGenerations.java deleted file mode 100644 index 174cc2cc38c..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusGenerations() { - } - - public ConfigStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public ConfigStatusGenerationsBuilder edit() { - return new ConfigStatusGenerationsBuilder(this); - } - - @JsonIgnore - public ConfigStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzureNAInternal.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzureNAInternal.java deleted file mode 100644 index 4579c6b7c16..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzureNAInternal.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "networkResourceGroupName", - "privateEndpointName", - "subnetName", - "vnetName" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSAzureNAInternal implements Editable , KubernetesResource -{ - - @JsonProperty("networkResourceGroupName") - private String networkResourceGroupName; - @JsonProperty("privateEndpointName") - private String privateEndpointName; - @JsonProperty("subnetName") - private String subnetName; - @JsonProperty("vnetName") - private String vnetName; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSAzureNAInternal() { - } - - public ConfigStatusSAzureNAInternal(String networkResourceGroupName, String privateEndpointName, String subnetName, String vnetName) { - super(); - this.networkResourceGroupName = networkResourceGroupName; - this.privateEndpointName = privateEndpointName; - this.subnetName = subnetName; - this.vnetName = vnetName; - } - - @JsonProperty("networkResourceGroupName") - public String getNetworkResourceGroupName() { - return networkResourceGroupName; - } - - @JsonProperty("networkResourceGroupName") - public void setNetworkResourceGroupName(String networkResourceGroupName) { - this.networkResourceGroupName = networkResourceGroupName; - } - - @JsonProperty("privateEndpointName") - public String getPrivateEndpointName() { - return privateEndpointName; - } - - @JsonProperty("privateEndpointName") - public void setPrivateEndpointName(String privateEndpointName) { - this.privateEndpointName = privateEndpointName; - } - - @JsonProperty("subnetName") - public String getSubnetName() { - return subnetName; - } - - @JsonProperty("subnetName") - public void setSubnetName(String subnetName) { - this.subnetName = subnetName; - } - - @JsonProperty("vnetName") - public String getVnetName() { - return vnetName; - } - - @JsonProperty("vnetName") - public void setVnetName(String vnetName) { - this.vnetName = vnetName; - } - - @JsonIgnore - public ConfigStatusSAzureNAInternalBuilder edit() { - return new ConfigStatusSAzureNAInternalBuilder(this); - } - - @JsonIgnore - public ConfigStatusSAzureNAInternalBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzureNetworkAccess.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzureNetworkAccess.java deleted file mode 100644 index 8a389738a27..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzureNetworkAccess.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "internal", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSAzureNetworkAccess implements Editable , KubernetesResource -{ - - @JsonProperty("internal") - private ConfigStatusSAzureNAInternal internal; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSAzureNetworkAccess() { - } - - public ConfigStatusSAzureNetworkAccess(ConfigStatusSAzureNAInternal internal, String type) { - super(); - this.internal = internal; - this.type = type; - } - - @JsonProperty("internal") - public ConfigStatusSAzureNAInternal getInternal() { - return internal; - } - - @JsonProperty("internal") - public void setInternal(ConfigStatusSAzureNAInternal internal) { - this.internal = internal; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public ConfigStatusSAzureNetworkAccessBuilder edit() { - return new ConfigStatusSAzureNetworkAccessBuilder(this); - } - - @JsonIgnore - public ConfigStatusSAzureNetworkAccessBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSGcs.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSGcs.java deleted file mode 100644 index 3172186037a..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSGcs.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "keyID", - "projectID", - "region" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSGcs implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("keyID") - private String keyID; - @JsonProperty("projectID") - private String projectID; - @JsonProperty("region") - private String region; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSGcs() { - } - - public ConfigStatusSGcs(String bucket, String keyID, String projectID, String region) { - super(); - this.bucket = bucket; - this.keyID = keyID; - this.projectID = projectID; - this.region = region; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("keyID") - public String getKeyID() { - return keyID; - } - - @JsonProperty("keyID") - public void setKeyID(String keyID) { - this.keyID = keyID; - } - - @JsonProperty("projectID") - public String getProjectID() { - return projectID; - } - - @JsonProperty("projectID") - public void setProjectID(String projectID) { - this.projectID = projectID; - } - - @JsonProperty("region") - public String getRegion() { - return region; - } - - @JsonProperty("region") - public void setRegion(String region) { - this.region = region; - } - - @JsonIgnore - public ConfigStatusSGcsBuilder edit() { - return new ConfigStatusSGcsBuilder(this); - } - - @JsonIgnore - public ConfigStatusSGcsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSIbmcos.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSIbmcos.java deleted file mode 100644 index 680e63fa5d8..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSIbmcos.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "location", - "resourceGroupName", - "resourceKeyCRN", - "serviceInstanceCRN" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSIbmcos implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("location") - private String location; - @JsonProperty("resourceGroupName") - private String resourceGroupName; - @JsonProperty("resourceKeyCRN") - private String resourceKeyCRN; - @JsonProperty("serviceInstanceCRN") - private String serviceInstanceCRN; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSIbmcos() { - } - - public ConfigStatusSIbmcos(String bucket, String location, String resourceGroupName, String resourceKeyCRN, String serviceInstanceCRN) { - super(); - this.bucket = bucket; - this.location = location; - this.resourceGroupName = resourceGroupName; - this.resourceKeyCRN = resourceKeyCRN; - this.serviceInstanceCRN = serviceInstanceCRN; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("location") - public String getLocation() { - return location; - } - - @JsonProperty("location") - public void setLocation(String location) { - this.location = location; - } - - @JsonProperty("resourceGroupName") - public String getResourceGroupName() { - return resourceGroupName; - } - - @JsonProperty("resourceGroupName") - public void setResourceGroupName(String resourceGroupName) { - this.resourceGroupName = resourceGroupName; - } - - @JsonProperty("resourceKeyCRN") - public String getResourceKeyCRN() { - return resourceKeyCRN; - } - - @JsonProperty("resourceKeyCRN") - public void setResourceKeyCRN(String resourceKeyCRN) { - this.resourceKeyCRN = resourceKeyCRN; - } - - @JsonProperty("serviceInstanceCRN") - public String getServiceInstanceCRN() { - return serviceInstanceCRN; - } - - @JsonProperty("serviceInstanceCRN") - public void setServiceInstanceCRN(String serviceInstanceCRN) { - this.serviceInstanceCRN = serviceInstanceCRN; - } - - @JsonIgnore - public ConfigStatusSIbmcosBuilder edit() { - return new ConfigStatusSIbmcosBuilder(this); - } - - @JsonIgnore - public ConfigStatusSIbmcosBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOEncryption.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOEncryption.java deleted file mode 100644 index 156c200daf1..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOEncryption.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "kms", - "method" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSOEncryption implements Editable , KubernetesResource -{ - - @JsonProperty("kms") - private ConfigStatusSOEKms kms; - @JsonProperty("method") - private String method; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSOEncryption() { - } - - public ConfigStatusSOEncryption(ConfigStatusSOEKms kms, String method) { - super(); - this.kms = kms; - this.method = method; - } - - @JsonProperty("kms") - public ConfigStatusSOEKms getKms() { - return kms; - } - - @JsonProperty("kms") - public void setKms(ConfigStatusSOEKms kms) { - this.kms = kms; - } - - @JsonProperty("method") - public String getMethod() { - return method; - } - - @JsonProperty("method") - public void setMethod(String method) { - this.method = method; - } - - @JsonIgnore - public ConfigStatusSOEncryptionBuilder edit() { - return new ConfigStatusSOEncryptionBuilder(this); - } - - @JsonIgnore - public ConfigStatusSOEncryptionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSS3.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSS3.java deleted file mode 100644 index dfb77cffd86..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSS3.java +++ /dev/null @@ -1,206 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "cloudFront", - "encrypt", - "keyID", - "region", - "regionEndpoint", - "trustedCA", - "virtualHostedStyle" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSS3 implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("cloudFront") - private ConfigStatusSSCloudFront cloudFront; - @JsonProperty("encrypt") - private Boolean encrypt; - @JsonProperty("keyID") - private String keyID; - @JsonProperty("region") - private String region; - @JsonProperty("regionEndpoint") - private String regionEndpoint; - @JsonProperty("trustedCA") - private ConfigStatusSSTrustedCA trustedCA; - @JsonProperty("virtualHostedStyle") - private Boolean virtualHostedStyle; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSS3() { - } - - public ConfigStatusSS3(String bucket, ConfigStatusSSCloudFront cloudFront, Boolean encrypt, String keyID, String region, String regionEndpoint, ConfigStatusSSTrustedCA trustedCA, Boolean virtualHostedStyle) { - super(); - this.bucket = bucket; - this.cloudFront = cloudFront; - this.encrypt = encrypt; - this.keyID = keyID; - this.region = region; - this.regionEndpoint = regionEndpoint; - this.trustedCA = trustedCA; - this.virtualHostedStyle = virtualHostedStyle; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("cloudFront") - public ConfigStatusSSCloudFront getCloudFront() { - return cloudFront; - } - - @JsonProperty("cloudFront") - public void setCloudFront(ConfigStatusSSCloudFront cloudFront) { - this.cloudFront = cloudFront; - } - - @JsonProperty("encrypt") - public Boolean getEncrypt() { - return encrypt; - } - - @JsonProperty("encrypt") - public void setEncrypt(Boolean encrypt) { - this.encrypt = encrypt; - } - - @JsonProperty("keyID") - public String getKeyID() { - return keyID; - } - - @JsonProperty("keyID") - public void setKeyID(String keyID) { - this.keyID = keyID; - } - - @JsonProperty("region") - public String getRegion() { - return region; - } - - @JsonProperty("region") - public void setRegion(String region) { - this.region = region; - } - - @JsonProperty("regionEndpoint") - public String getRegionEndpoint() { - return regionEndpoint; - } - - @JsonProperty("regionEndpoint") - public void setRegionEndpoint(String regionEndpoint) { - this.regionEndpoint = regionEndpoint; - } - - @JsonProperty("trustedCA") - public ConfigStatusSSTrustedCA getTrustedCA() { - return trustedCA; - } - - @JsonProperty("trustedCA") - public void setTrustedCA(ConfigStatusSSTrustedCA trustedCA) { - this.trustedCA = trustedCA; - } - - @JsonProperty("virtualHostedStyle") - public Boolean getVirtualHostedStyle() { - return virtualHostedStyle; - } - - @JsonProperty("virtualHostedStyle") - public void setVirtualHostedStyle(Boolean virtualHostedStyle) { - this.virtualHostedStyle = virtualHostedStyle; - } - - @JsonIgnore - public ConfigStatusSS3Builder edit() { - return new ConfigStatusSS3Builder(this); - } - - @JsonIgnore - public ConfigStatusSS3Builder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSCFPrivateKey.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSCFPrivateKey.java deleted file mode 100644 index 454b5003ca5..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSCFPrivateKey.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "name", - "optional" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSSCFPrivateKey implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("name") - private String name; - @JsonProperty("optional") - private Boolean optional; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSSCFPrivateKey() { - } - - public ConfigStatusSSCFPrivateKey(String key, String name, Boolean optional) { - super(); - this.key = key; - this.name = name; - this.optional = optional; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonProperty("optional") - public Boolean getOptional() { - return optional; - } - - @JsonProperty("optional") - public void setOptional(Boolean optional) { - this.optional = optional; - } - - @JsonIgnore - public ConfigStatusSSCFPrivateKeyBuilder edit() { - return new ConfigStatusSSCFPrivateKeyBuilder(this); - } - - @JsonIgnore - public ConfigStatusSSCFPrivateKeyBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSCloudFront.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSCloudFront.java deleted file mode 100644 index 1520a1069df..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSCloudFront.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "baseURL", - "duration", - "keypairID", - "privateKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusSSCloudFront implements Editable , KubernetesResource -{ - - @JsonProperty("baseURL") - private String baseURL; - @JsonProperty("duration") - private String duration; - @JsonProperty("keypairID") - private String keypairID; - @JsonProperty("privateKey") - private ConfigStatusSSCFPrivateKey privateKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSSCloudFront() { - } - - public ConfigStatusSSCloudFront(String baseURL, String duration, String keypairID, ConfigStatusSSCFPrivateKey privateKey) { - super(); - this.baseURL = baseURL; - this.duration = duration; - this.keypairID = keypairID; - this.privateKey = privateKey; - } - - @JsonProperty("baseURL") - public String getBaseURL() { - return baseURL; - } - - @JsonProperty("baseURL") - public void setBaseURL(String baseURL) { - this.baseURL = baseURL; - } - - @JsonProperty("duration") - public String getDuration() { - return duration; - } - - @JsonProperty("duration") - public void setDuration(String duration) { - this.duration = duration; - } - - @JsonProperty("keypairID") - public String getKeypairID() { - return keypairID; - } - - @JsonProperty("keypairID") - public void setKeypairID(String keypairID) { - this.keypairID = keypairID; - } - - @JsonProperty("privateKey") - public ConfigStatusSSCFPrivateKey getPrivateKey() { - return privateKey; - } - - @JsonProperty("privateKey") - public void setPrivateKey(ConfigStatusSSCFPrivateKey privateKey) { - this.privateKey = privateKey; - } - - @JsonIgnore - public ConfigStatusSSCloudFrontBuilder edit() { - return new ConfigStatusSSCloudFrontBuilder(this); - } - - @JsonIgnore - public ConfigStatusSSCloudFrontBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSTrustedCA.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSTrustedCA.java deleted file mode 100644 index d4214160d4c..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSSTrustedCA.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "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 ConfigStatusSSTrustedCA implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusSSTrustedCA() { - } - - public ConfigStatusSSTrustedCA(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public ConfigStatusSSTrustedCABuilder edit() { - return new ConfigStatusSSTrustedCABuilder(this); - } - - @JsonIgnore - public ConfigStatusSSTrustedCABuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOEncryption.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/EncryptionAlibaba.java similarity index 87% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOEncryption.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/EncryptionAlibaba.java index aeceef619f9..0825ff9df49 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOEncryption.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/EncryptionAlibaba.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSOEncryption implements Editable , KubernetesResource +public class EncryptionAlibaba implements Editable , KubernetesResource { @JsonProperty("kms") - private ConfigSpecSOEKms kms; + private KMSEncryptionAlibaba kms; @JsonProperty("method") private String method; @JsonIgnore @@ -66,22 +66,22 @@ public class ConfigSpecSOEncryption implements Editable , Kuber { @JsonProperty("affinity") - private ImagePrunerSpecAffinity affinity; + private Affinity affinity; @JsonProperty("failedJobsHistoryLimit") private Integer failedJobsHistoryLimit; @JsonProperty("ignoreInvalidImageReferences") @@ -86,7 +88,7 @@ public class ImagePrunerSpec implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map nodeSelector = new LinkedHashMap<>(); @JsonProperty("resources") - private ImagePrunerSpecResources resources; + private ResourceRequirements resources; @JsonProperty("schedule") private String schedule; @JsonProperty("successfulJobsHistoryLimit") @@ -95,7 +97,7 @@ public class ImagePrunerSpec implements Editable , Kuber private Boolean suspend; @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -106,7 +108,7 @@ public class ImagePrunerSpec implements Editable , Kuber public ImagePrunerSpec() { } - public ImagePrunerSpec(ImagePrunerSpecAffinity affinity, Integer failedJobsHistoryLimit, Boolean ignoreInvalidImageReferences, Integer keepTagRevisions, Long keepYoungerThan, String keepYoungerThanDuration, String logLevel, Map nodeSelector, ImagePrunerSpecResources resources, String schedule, Integer successfulJobsHistoryLimit, Boolean suspend, List tolerations) { + public ImagePrunerSpec(Affinity affinity, Integer failedJobsHistoryLimit, Boolean ignoreInvalidImageReferences, Integer keepTagRevisions, Long keepYoungerThan, String keepYoungerThanDuration, String logLevel, Map nodeSelector, ResourceRequirements resources, String schedule, Integer successfulJobsHistoryLimit, Boolean suspend, List tolerations) { super(); this.affinity = affinity; this.failedJobsHistoryLimit = failedJobsHistoryLimit; @@ -124,12 +126,12 @@ public ImagePrunerSpec(ImagePrunerSpecAffinity affinity, Integer failedJobsHisto } @JsonProperty("affinity") - public ImagePrunerSpecAffinity getAffinity() { + public Affinity getAffinity() { return affinity; } @JsonProperty("affinity") - public void setAffinity(ImagePrunerSpecAffinity affinity) { + public void setAffinity(Affinity affinity) { this.affinity = affinity; } @@ -205,12 +207,12 @@ public void setNodeSelector(Map nodeSelector) { } @JsonProperty("resources") - public ImagePrunerSpecResources getResources() { + public ResourceRequirements getResources() { return resources; } @JsonProperty("resources") - public void setResources(ImagePrunerSpecResources resources) { + public void setResources(ResourceRequirements resources) { this.resources = resources; } @@ -246,12 +248,12 @@ public void setSuspend(Boolean suspend) { @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPMatchExpressions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPMatchExpressions.java deleted file mode 100644 index fc4b150076a..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPMatchExpressions.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANAPDSIDEPMatchExpressions implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANAPDSIDEPMatchExpressions() { - } - - public ImagePrunerSpecANAPDSIDEPMatchExpressions(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ImagePrunerSpecANAPDSIDEPMatchExpressionsBuilder edit() { - return new ImagePrunerSpecANAPDSIDEPMatchExpressionsBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANAPDSIDEPMatchExpressionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPMatchFields.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPMatchFields.java deleted file mode 100644 index db4036ea5aa..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPMatchFields.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANAPDSIDEPMatchFields implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANAPDSIDEPMatchFields() { - } - - public ImagePrunerSpecANAPDSIDEPMatchFields(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ImagePrunerSpecANAPDSIDEPMatchFieldsBuilder edit() { - return new ImagePrunerSpecANAPDSIDEPMatchFieldsBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANAPDSIDEPMatchFieldsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPreference.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPreference.java deleted file mode 100644 index bd7c38d387b..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPDSIDEPreference.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchFields" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANAPDSIDEPreference implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchFields = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANAPDSIDEPreference() { - } - - public ImagePrunerSpecANAPDSIDEPreference(List matchExpressions, List matchFields) { - super(); - this.matchExpressions = matchExpressions; - this.matchFields = matchFields; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchFields() { - return matchFields; - } - - @JsonProperty("matchFields") - public void setMatchFields(List matchFields) { - this.matchFields = matchFields; - } - - @JsonIgnore - public ImagePrunerSpecANAPDSIDEPreferenceBuilder edit() { - return new ImagePrunerSpecANAPDSIDEPreferenceBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANAPDSIDEPreferenceBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 49aec028d53..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preference", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("preference") - private ImagePrunerSpecANAPDSIDEPreference preference; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecution() { - } - - public ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecution(ImagePrunerSpecANAPDSIDEPreference preference, Integer weight) { - super(); - this.preference = preference; - this.weight = weight; - } - - @JsonProperty("preference") - public ImagePrunerSpecANAPDSIDEPreference getPreference() { - return preference; - } - - @JsonProperty("preference") - public void setPreference(ImagePrunerSpecANAPDSIDEPreference preference) { - this.preference = preference; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENSTMatchExpressions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENSTMatchExpressions.java deleted file mode 100644 index 8ea726a0d4e..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENSTMatchExpressions.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANARDSIDENSTMatchExpressions implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANARDSIDENSTMatchExpressions() { - } - - public ImagePrunerSpecANARDSIDENSTMatchExpressions(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ImagePrunerSpecANARDSIDENSTMatchExpressionsBuilder edit() { - return new ImagePrunerSpecANARDSIDENSTMatchExpressionsBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANARDSIDENSTMatchExpressionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENSTMatchFields.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENSTMatchFields.java deleted file mode 100644 index 2a76ade4619..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENSTMatchFields.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "key", - "operator", - "values" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANARDSIDENSTMatchFields implements Editable , KubernetesResource -{ - - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANARDSIDENSTMatchFields() { - } - - public ImagePrunerSpecANARDSIDENSTMatchFields(String key, String operator, List values) { - super(); - this.key = key; - this.operator = operator; - this.values = values; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; - } - - @JsonProperty("values") - public void setValues(List values) { - this.values = values; - } - - @JsonIgnore - public ImagePrunerSpecANARDSIDENSTMatchFieldsBuilder edit() { - return new ImagePrunerSpecANARDSIDENSTMatchFieldsBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANARDSIDENSTMatchFieldsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENodeSelectorTerms.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENodeSelectorTerms.java deleted file mode 100644 index bd91041459d..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARDSIDENodeSelectorTerms.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchFields" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANARDSIDENodeSelectorTerms implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchFields = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANARDSIDENodeSelectorTerms() { - } - - public ImagePrunerSpecANARDSIDENodeSelectorTerms(List matchExpressions, List matchFields) { - super(); - this.matchExpressions = matchExpressions; - this.matchFields = matchFields; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchFields") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchFields() { - return matchFields; - } - - @JsonProperty("matchFields") - public void setMatchFields(List matchFields) { - this.matchFields = matchFields; - } - - @JsonIgnore - public ImagePrunerSpecANARDSIDENodeSelectorTermsBuilder edit() { - return new ImagePrunerSpecANARDSIDENodeSelectorTermsBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANARDSIDENodeSelectorTermsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 30bfb557112..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,112 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "nodeSelectorTerms" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("nodeSelectorTerms") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nodeSelectorTerms = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution() { - } - - public ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution(List nodeSelectorTerms) { - super(); - this.nodeSelectorTerms = nodeSelectorTerms; - } - - @JsonProperty("nodeSelectorTerms") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNodeSelectorTerms() { - return nodeSelectorTerms; - } - - @JsonProperty("nodeSelectorTerms") - public void setNodeSelectorTerms(List nodeSelectorTerms) { - this.nodeSelectorTerms = nodeSelectorTerms; - } - - @JsonIgnore - public ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANodeAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANodeAffinity.java deleted file mode 100644 index 53747898da4..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecANodeAffinity.java +++ /dev/null @@ -1,126 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preferredDuringSchedulingIgnoredDuringExecution", - "requiredDuringSchedulingIgnoredDuringExecution" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecANodeAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - private ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecANodeAffinity() { - } - - public ImagePrunerSpecANodeAffinity(List preferredDuringSchedulingIgnoredDuringExecution, ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) { - super(); - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreferredDuringSchedulingIgnoredDuringExecution() { - return preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - public void setPreferredDuringSchedulingIgnoredDuringExecution(List preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution getRequiredDuringSchedulingIgnoredDuringExecution() { - return requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public void setRequiredDuringSchedulingIgnoredDuringExecution(ImagePrunerSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonIgnore - public ImagePrunerSpecANodeAffinityBuilder edit() { - return new ImagePrunerSpecANodeAffinityBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecANodeAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPATLabelSelector.java deleted file mode 100644 index 0670b678dcd..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPATLabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAAPDSIDEPATLabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAAPDSIDEPATLabelSelector() { - } - - public ImagePrunerSpecAPAAPDSIDEPATLabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPAAPDSIDEPATLabelSelectorBuilder edit() { - return new ImagePrunerSpecAPAAPDSIDEPATLabelSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAAPDSIDEPATLabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector.java deleted file mode 100644 index f0a6cc1c7e7..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector() { - } - - public ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPAAPDSIDEPATNamespaceSelectorBuilder edit() { - return new ImagePrunerSpecAPAAPDSIDEPATNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAAPDSIDEPATNamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPodAffinityTerm.java deleted file mode 100644 index 804f385a4c5..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPDSIDEPodAffinityTerm.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAAPDSIDEPodAffinityTerm implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ImagePrunerSpecAPAAPDSIDEPATLabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAAPDSIDEPodAffinityTerm() { - } - - public ImagePrunerSpecAPAAPDSIDEPodAffinityTerm(ImagePrunerSpecAPAAPDSIDEPATLabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ImagePrunerSpecAPAAPDSIDEPATLabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ImagePrunerSpecAPAAPDSIDEPATLabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ImagePrunerSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ImagePrunerSpecAPAAPDSIDEPodAffinityTermBuilder edit() { - return new ImagePrunerSpecAPAAPDSIDEPodAffinityTermBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAAPDSIDEPodAffinityTermBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 0baaee4c838..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "podAffinityTerm", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("podAffinityTerm") - private ImagePrunerSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution() { - } - - public ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution(ImagePrunerSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) { - super(); - this.podAffinityTerm = podAffinityTerm; - this.weight = weight; - } - - @JsonProperty("podAffinityTerm") - public ImagePrunerSpecAPAAPDSIDEPodAffinityTerm getPodAffinityTerm() { - return podAffinityTerm; - } - - @JsonProperty("podAffinityTerm") - public void setPodAffinityTerm(ImagePrunerSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm) { - this.podAffinityTerm = podAffinityTerm; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARDSIDELabelSelector.java deleted file mode 100644 index 98fd5009155..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARDSIDELabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAARDSIDELabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAARDSIDELabelSelector() { - } - - public ImagePrunerSpecAPAARDSIDELabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPAARDSIDELabelSelectorBuilder edit() { - return new ImagePrunerSpecAPAARDSIDELabelSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAARDSIDELabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARDSIDENamespaceSelector.java deleted file mode 100644 index c633cfed303..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARDSIDENamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAARDSIDENamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAARDSIDENamespaceSelector() { - } - - public ImagePrunerSpecAPAARDSIDENamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPAARDSIDENamespaceSelectorBuilder edit() { - return new ImagePrunerSpecAPAARDSIDENamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAARDSIDENamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index 376c23c1f06..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ImagePrunerSpecAPAARDSIDELabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ImagePrunerSpecAPAARDSIDENamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecution() { - } - - public ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecution(ImagePrunerSpecAPAARDSIDELabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ImagePrunerSpecAPAARDSIDENamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ImagePrunerSpecAPAARDSIDELabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ImagePrunerSpecAPAARDSIDELabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ImagePrunerSpecAPAARDSIDENamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ImagePrunerSpecAPAARDSIDENamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPATLabelSelector.java deleted file mode 100644 index 092fe7c81fd..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPATLabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAPDSIDEPATLabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAPDSIDEPATLabelSelector() { - } - - public ImagePrunerSpecAPAPDSIDEPATLabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPAPDSIDEPATLabelSelectorBuilder edit() { - return new ImagePrunerSpecAPAPDSIDEPATLabelSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAPDSIDEPATLabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPATNamespaceSelector.java deleted file mode 100644 index b98413d03d2..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPATNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAPDSIDEPATNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAPDSIDEPATNamespaceSelector() { - } - - public ImagePrunerSpecAPAPDSIDEPATNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPAPDSIDEPATNamespaceSelectorBuilder edit() { - return new ImagePrunerSpecAPAPDSIDEPATNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAPDSIDEPATNamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPodAffinityTerm.java deleted file mode 100644 index 73b84813fa0..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPDSIDEPodAffinityTerm.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAPDSIDEPodAffinityTerm implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ImagePrunerSpecAPAPDSIDEPATLabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ImagePrunerSpecAPAPDSIDEPATNamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAPDSIDEPodAffinityTerm() { - } - - public ImagePrunerSpecAPAPDSIDEPodAffinityTerm(ImagePrunerSpecAPAPDSIDEPATLabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ImagePrunerSpecAPAPDSIDEPATNamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ImagePrunerSpecAPAPDSIDEPATLabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ImagePrunerSpecAPAPDSIDEPATLabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ImagePrunerSpecAPAPDSIDEPATNamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ImagePrunerSpecAPAPDSIDEPATNamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ImagePrunerSpecAPAPDSIDEPodAffinityTermBuilder edit() { - return new ImagePrunerSpecAPAPDSIDEPodAffinityTermBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAPDSIDEPodAffinityTermBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index fff57b99b3a..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "podAffinityTerm", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("podAffinityTerm") - private ImagePrunerSpecAPAPDSIDEPodAffinityTerm podAffinityTerm; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecution() { - } - - public ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecution(ImagePrunerSpecAPAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) { - super(); - this.podAffinityTerm = podAffinityTerm; - this.weight = weight; - } - - @JsonProperty("podAffinityTerm") - public ImagePrunerSpecAPAPDSIDEPodAffinityTerm getPodAffinityTerm() { - return podAffinityTerm; - } - - @JsonProperty("podAffinityTerm") - public void setPodAffinityTerm(ImagePrunerSpecAPAPDSIDEPodAffinityTerm podAffinityTerm) { - this.podAffinityTerm = podAffinityTerm; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARDSIDELabelSelector.java deleted file mode 100644 index 90717007212..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARDSIDELabelSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPARDSIDELabelSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPARDSIDELabelSelector() { - } - - public ImagePrunerSpecAPARDSIDELabelSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPARDSIDELabelSelectorBuilder edit() { - return new ImagePrunerSpecAPARDSIDELabelSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPARDSIDELabelSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARDSIDENamespaceSelector.java deleted file mode 100644 index f6c25d30cb4..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARDSIDENamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPARDSIDENamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPARDSIDENamespaceSelector() { - } - - public ImagePrunerSpecAPARDSIDENamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public ImagePrunerSpecAPARDSIDENamespaceSelectorBuilder edit() { - return new ImagePrunerSpecAPARDSIDENamespaceSelectorBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPARDSIDENamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java deleted file mode 100644 index bc5cd80f2f8..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java +++ /dev/null @@ -1,186 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "labelSelector", - "matchLabelKeys", - "mismatchLabelKeys", - "namespaceSelector", - "namespaces", - "topologyKey" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecution implements Editable , KubernetesResource -{ - - @JsonProperty("labelSelector") - private ImagePrunerSpecAPARDSIDELabelSelector labelSelector; - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchLabelKeys = new ArrayList<>(); - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List mismatchLabelKeys = new ArrayList<>(); - @JsonProperty("namespaceSelector") - private ImagePrunerSpecAPARDSIDENamespaceSelector namespaceSelector; - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("topologyKey") - private String topologyKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecution() { - } - - public ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecution(ImagePrunerSpecAPARDSIDELabelSelector labelSelector, List matchLabelKeys, List mismatchLabelKeys, ImagePrunerSpecAPARDSIDENamespaceSelector namespaceSelector, List namespaces, String topologyKey) { - super(); - this.labelSelector = labelSelector; - this.matchLabelKeys = matchLabelKeys; - this.mismatchLabelKeys = mismatchLabelKeys; - this.namespaceSelector = namespaceSelector; - this.namespaces = namespaces; - this.topologyKey = topologyKey; - } - - @JsonProperty("labelSelector") - public ImagePrunerSpecAPARDSIDELabelSelector getLabelSelector() { - return labelSelector; - } - - @JsonProperty("labelSelector") - public void setLabelSelector(ImagePrunerSpecAPARDSIDELabelSelector labelSelector) { - this.labelSelector = labelSelector; - } - - @JsonProperty("matchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchLabelKeys() { - return matchLabelKeys; - } - - @JsonProperty("matchLabelKeys") - public void setMatchLabelKeys(List matchLabelKeys) { - this.matchLabelKeys = matchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMismatchLabelKeys() { - return mismatchLabelKeys; - } - - @JsonProperty("mismatchLabelKeys") - public void setMismatchLabelKeys(List mismatchLabelKeys) { - this.mismatchLabelKeys = mismatchLabelKeys; - } - - @JsonProperty("namespaceSelector") - public ImagePrunerSpecAPARDSIDENamespaceSelector getNamespaceSelector() { - return namespaceSelector; - } - - @JsonProperty("namespaceSelector") - public void setNamespaceSelector(ImagePrunerSpecAPARDSIDENamespaceSelector namespaceSelector) { - this.namespaceSelector = namespaceSelector; - } - - @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; - } - - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; - } - - @JsonProperty("topologyKey") - public String getTopologyKey() { - return topologyKey; - } - - @JsonProperty("topologyKey") - public void setTopologyKey(String topologyKey) { - this.topologyKey = topologyKey; - } - - @JsonIgnore - public ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() { - return new ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPodAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPodAffinity.java deleted file mode 100644 index c76b9dfa36c..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPodAffinity.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preferredDuringSchedulingIgnoredDuringExecution", - "requiredDuringSchedulingIgnoredDuringExecution" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPodAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPodAffinity() { - } - - public ImagePrunerSpecAPodAffinity(List preferredDuringSchedulingIgnoredDuringExecution, List requiredDuringSchedulingIgnoredDuringExecution) { - super(); - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreferredDuringSchedulingIgnoredDuringExecution() { - return preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - public void setPreferredDuringSchedulingIgnoredDuringExecution(List preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRequiredDuringSchedulingIgnoredDuringExecution() { - return requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public void setRequiredDuringSchedulingIgnoredDuringExecution(List requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonIgnore - public ImagePrunerSpecAPodAffinityBuilder edit() { - return new ImagePrunerSpecAPodAffinityBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPodAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPodAntiAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPodAntiAffinity.java deleted file mode 100644 index cb05aaf72b8..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAPodAntiAffinity.java +++ /dev/null @@ -1,128 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "preferredDuringSchedulingIgnoredDuringExecution", - "requiredDuringSchedulingIgnoredDuringExecution" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAPodAntiAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAPodAntiAffinity() { - } - - public ImagePrunerSpecAPodAntiAffinity(List preferredDuringSchedulingIgnoredDuringExecution, List requiredDuringSchedulingIgnoredDuringExecution) { - super(); - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreferredDuringSchedulingIgnoredDuringExecution() { - return preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - public void setPreferredDuringSchedulingIgnoredDuringExecution(List preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRequiredDuringSchedulingIgnoredDuringExecution() { - return requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public void setRequiredDuringSchedulingIgnoredDuringExecution(List requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; - } - - @JsonIgnore - public ImagePrunerSpecAPodAntiAffinityBuilder edit() { - return new ImagePrunerSpecAPodAntiAffinityBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAPodAntiAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAffinity.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAffinity.java deleted file mode 100644 index 5141e42b2c2..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecAffinity.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "nodeAffinity", - "podAffinity", - "podAntiAffinity" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecAffinity implements Editable , KubernetesResource -{ - - @JsonProperty("nodeAffinity") - private ImagePrunerSpecANodeAffinity nodeAffinity; - @JsonProperty("podAffinity") - private ImagePrunerSpecAPodAffinity podAffinity; - @JsonProperty("podAntiAffinity") - private ImagePrunerSpecAPodAntiAffinity podAntiAffinity; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecAffinity() { - } - - public ImagePrunerSpecAffinity(ImagePrunerSpecANodeAffinity nodeAffinity, ImagePrunerSpecAPodAffinity podAffinity, ImagePrunerSpecAPodAntiAffinity podAntiAffinity) { - super(); - this.nodeAffinity = nodeAffinity; - this.podAffinity = podAffinity; - this.podAntiAffinity = podAntiAffinity; - } - - @JsonProperty("nodeAffinity") - public ImagePrunerSpecANodeAffinity getNodeAffinity() { - return nodeAffinity; - } - - @JsonProperty("nodeAffinity") - public void setNodeAffinity(ImagePrunerSpecANodeAffinity nodeAffinity) { - this.nodeAffinity = nodeAffinity; - } - - @JsonProperty("podAffinity") - public ImagePrunerSpecAPodAffinity getPodAffinity() { - return podAffinity; - } - - @JsonProperty("podAffinity") - public void setPodAffinity(ImagePrunerSpecAPodAffinity podAffinity) { - this.podAffinity = podAffinity; - } - - @JsonProperty("podAntiAffinity") - public ImagePrunerSpecAPodAntiAffinity getPodAntiAffinity() { - return podAntiAffinity; - } - - @JsonProperty("podAntiAffinity") - public void setPodAntiAffinity(ImagePrunerSpecAPodAntiAffinity podAntiAffinity) { - this.podAntiAffinity = podAntiAffinity; - } - - @JsonIgnore - public ImagePrunerSpecAffinityBuilder edit() { - return new ImagePrunerSpecAffinityBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecAffinityBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecResources.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecResources.java deleted file mode 100644 index 98ad75639ab..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecResources.java +++ /dev/null @@ -1,149 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceClaim; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "claims", - "limits", - "requests" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecResources implements Editable , KubernetesResource -{ - - @JsonProperty("claims") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List claims = new ArrayList<>(); - @JsonProperty("limits") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map limits = new LinkedHashMap<>(); - @JsonProperty("requests") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map requests = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecResources() { - } - - public ImagePrunerSpecResources(List claims, Map limits, Map requests) { - super(); - this.claims = claims; - this.limits = limits; - this.requests = requests; - } - - @JsonProperty("claims") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClaims() { - return claims; - } - - @JsonProperty("claims") - public void setClaims(List claims) { - this.claims = claims; - } - - @JsonProperty("limits") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getLimits() { - return limits; - } - - @JsonProperty("limits") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setLimits(Map limits) { - this.limits = limits; - } - - @JsonProperty("requests") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getRequests() { - return requests; - } - - @JsonProperty("requests") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setRequests(Map requests) { - this.requests = requests; - } - - @JsonIgnore - public ImagePrunerSpecResourcesBuilder edit() { - return new ImagePrunerSpecResourcesBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecResourcesBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecTolerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecTolerations.java deleted file mode 100644 index 1d296a54803..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerSpecTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.imageregistry.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImagePrunerSpecTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImagePrunerSpecTolerations() { - } - - public ImagePrunerSpecTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public ImagePrunerSpecTolerationsBuilder edit() { - return new ImagePrunerSpecTolerationsBuilder(this); - } - - @JsonIgnore - public ImagePrunerSpecTolerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatus.java index eec92efdd79..52569e4c055 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatus.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.operator.v1.OperatorCondition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -59,7 +60,7 @@ public class ImagePrunerStatus implements Editable , K @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonIgnore @@ -72,7 +73,7 @@ public class ImagePrunerStatus implements Editable , K public ImagePrunerStatus() { } - public ImagePrunerStatus(List conditions, Long observedGeneration) { + public ImagePrunerStatus(List conditions, Long observedGeneration) { super(); this.conditions = conditions; this.observedGeneration = observedGeneration; @@ -80,12 +81,12 @@ public ImagePrunerStatus(List conditions, Long obse @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecProxy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigProxy.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecProxy.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigProxy.java index 4641a1dac93..5cfb9844cf3 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecProxy.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigProxy.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecProxy implements Editable , KubernetesResource +public class ImageRegistryConfigProxy implements Editable , KubernetesResource { @JsonProperty("http") @@ -69,10 +69,10 @@ public class ConfigSpecProxy implements Editable , Kuber * No args constructor for use in serialization * */ - public ConfigSpecProxy() { + public ImageRegistryConfigProxy() { } - public ConfigSpecProxy(String http, String https, String noProxy) { + public ImageRegistryConfigProxy(String http, String https, String noProxy) { super(); this.http = http; this.https = https; @@ -110,12 +110,12 @@ public void setNoProxy(String noProxy) { } @JsonIgnore - public ConfigSpecProxyBuilder edit() { - return new ConfigSpecProxyBuilder(this); + public ImageRegistryConfigProxyBuilder edit() { + return new ImageRegistryConfigProxyBuilder(this); } @JsonIgnore - public ConfigSpecProxyBuilder toBuilder() { + public ImageRegistryConfigProxyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRequests.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRequests.java similarity index 80% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRequests.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRequests.java index 7be402490f0..61ac3d0b737 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRequests.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRequests.java @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecRequests implements Editable , KubernetesResource +public class ImageRegistryConfigRequests implements Editable , KubernetesResource { @JsonProperty("read") - private ConfigSpecRRead read; + private ImageRegistryConfigRequestsLimits read; @JsonProperty("write") - private ConfigSpecRWrite write; + private ImageRegistryConfigRequestsLimits write; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class ConfigSpecRequests implements Editable , * No args constructor for use in serialization * */ - public ConfigSpecRequests() { + public ImageRegistryConfigRequests() { } - public ConfigSpecRequests(ConfigSpecRRead read, ConfigSpecRWrite write) { + public ImageRegistryConfigRequests(ImageRegistryConfigRequestsLimits read, ImageRegistryConfigRequestsLimits write) { super(); this.read = read; this.write = write; } @JsonProperty("read") - public ConfigSpecRRead getRead() { + public ImageRegistryConfigRequestsLimits getRead() { return read; } @JsonProperty("read") - public void setRead(ConfigSpecRRead read) { + public void setRead(ImageRegistryConfigRequestsLimits read) { this.read = read; } @JsonProperty("write") - public ConfigSpecRWrite getWrite() { + public ImageRegistryConfigRequestsLimits getWrite() { return write; } @JsonProperty("write") - public void setWrite(ConfigSpecRWrite write) { + public void setWrite(ImageRegistryConfigRequestsLimits write) { this.write = write; } @JsonIgnore - public ConfigSpecRequestsBuilder edit() { - return new ConfigSpecRequestsBuilder(this); + public ImageRegistryConfigRequestsBuilder edit() { + return new ImageRegistryConfigRequestsBuilder(this); } @JsonIgnore - public ConfigSpecRequestsBuilder toBuilder() { + public ImageRegistryConfigRequestsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRRead.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRequestsLimits.java similarity index 89% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRRead.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRequestsLimits.java index b5f32bee8a7..119d9a6f3af 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRRead.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRequestsLimits.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecRRead implements Editable , KubernetesResource +public class ImageRegistryConfigRequestsLimits implements Editable , KubernetesResource { @JsonProperty("maxInQueue") @@ -69,10 +69,10 @@ public class ConfigSpecRRead implements Editable , Kuber * No args constructor for use in serialization * */ - public ConfigSpecRRead() { + public ImageRegistryConfigRequestsLimits() { } - public ConfigSpecRRead(Integer maxInQueue, Integer maxRunning, String maxWaitInQueue) { + public ImageRegistryConfigRequestsLimits(Integer maxInQueue, Integer maxRunning, String maxWaitInQueue) { super(); this.maxInQueue = maxInQueue; this.maxRunning = maxRunning; @@ -110,12 +110,12 @@ public void setMaxWaitInQueue(String maxWaitInQueue) { } @JsonIgnore - public ConfigSpecRReadBuilder edit() { - return new ConfigSpecRReadBuilder(this); + public ImageRegistryConfigRequestsLimitsBuilder edit() { + return new ImageRegistryConfigRequestsLimitsBuilder(this); } @JsonIgnore - public ConfigSpecRReadBuilder toBuilder() { + public ImageRegistryConfigRequestsLimitsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRoutes.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRoute.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRoutes.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRoute.java index c926670437c..f51ad978cbf 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecRoutes.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigRoute.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecRoutes implements Editable , KubernetesResource +public class ImageRegistryConfigRoute implements Editable , KubernetesResource { @JsonProperty("hostname") @@ -69,10 +69,10 @@ public class ConfigSpecRoutes implements Editable , Kub * No args constructor for use in serialization * */ - public ConfigSpecRoutes() { + public ImageRegistryConfigRoute() { } - public ConfigSpecRoutes(String hostname, String name, String secretName) { + public ImageRegistryConfigRoute(String hostname, String name, String secretName) { super(); this.hostname = hostname; this.name = name; @@ -110,12 +110,12 @@ public void setSecretName(String secretName) { } @JsonIgnore - public ConfigSpecRoutesBuilder edit() { - return new ConfigSpecRoutesBuilder(this); + public ImageRegistryConfigRouteBuilder edit() { + return new ImageRegistryConfigRouteBuilder(this); } @JsonIgnore - public ConfigSpecRoutesBuilder toBuilder() { + public ImageRegistryConfigRouteBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusStorage.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorage.java similarity index 69% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusStorage.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorage.java index 9e3917f22ae..309cd564f8b 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusStorage.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorage.java @@ -59,28 +59,27 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusStorage implements Editable , KubernetesResource +public class ImageRegistryConfigStorage implements Editable , KubernetesResource { @JsonProperty("azure") - private ConfigStatusSAzure azure; + private ImageRegistryConfigStorageAzure azure; @JsonProperty("emptyDir") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object emptyDir; + private ImageRegistryConfigStorageEmptyDir emptyDir; @JsonProperty("gcs") - private ConfigStatusSGcs gcs; + private ImageRegistryConfigStorageGCS gcs; @JsonProperty("ibmcos") - private ConfigStatusSIbmcos ibmcos; + private ImageRegistryConfigStorageIBMCOS ibmcos; @JsonProperty("managementState") private String managementState; @JsonProperty("oss") - private ConfigStatusSOss oss; + private ImageRegistryConfigStorageAlibabaOSS oss; @JsonProperty("pvc") - private ConfigStatusSPvc pvc; + private ImageRegistryConfigStoragePVC pvc; @JsonProperty("s3") - private ConfigStatusSS3 s3; + private ImageRegistryConfigStorageS3 s3; @JsonProperty("swift") - private ConfigStatusSSwift swift; + private ImageRegistryConfigStorageSwift swift; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -88,10 +87,10 @@ public class ConfigStatusStorage implements Editable * No args constructor for use in serialization * */ - public ConfigStatusStorage() { + public ImageRegistryConfigStorage() { } - public ConfigStatusStorage(ConfigStatusSAzure azure, Object emptyDir, ConfigStatusSGcs gcs, ConfigStatusSIbmcos ibmcos, String managementState, ConfigStatusSOss oss, ConfigStatusSPvc pvc, ConfigStatusSS3 s3, ConfigStatusSSwift swift) { + public ImageRegistryConfigStorage(ImageRegistryConfigStorageAzure azure, ImageRegistryConfigStorageEmptyDir emptyDir, ImageRegistryConfigStorageGCS gcs, ImageRegistryConfigStorageIBMCOS ibmcos, String managementState, ImageRegistryConfigStorageAlibabaOSS oss, ImageRegistryConfigStoragePVC pvc, ImageRegistryConfigStorageS3 s3, ImageRegistryConfigStorageSwift swift) { super(); this.azure = azure; this.emptyDir = emptyDir; @@ -105,43 +104,42 @@ public ConfigStatusStorage(ConfigStatusSAzure azure, Object emptyDir, ConfigStat } @JsonProperty("azure") - public ConfigStatusSAzure getAzure() { + public ImageRegistryConfigStorageAzure getAzure() { return azure; } @JsonProperty("azure") - public void setAzure(ConfigStatusSAzure azure) { + public void setAzure(ImageRegistryConfigStorageAzure azure) { this.azure = azure; } @JsonProperty("emptyDir") - public Object getEmptyDir() { + public ImageRegistryConfigStorageEmptyDir getEmptyDir() { return emptyDir; } @JsonProperty("emptyDir") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setEmptyDir(Object emptyDir) { + public void setEmptyDir(ImageRegistryConfigStorageEmptyDir emptyDir) { this.emptyDir = emptyDir; } @JsonProperty("gcs") - public ConfigStatusSGcs getGcs() { + public ImageRegistryConfigStorageGCS getGcs() { return gcs; } @JsonProperty("gcs") - public void setGcs(ConfigStatusSGcs gcs) { + public void setGcs(ImageRegistryConfigStorageGCS gcs) { this.gcs = gcs; } @JsonProperty("ibmcos") - public ConfigStatusSIbmcos getIbmcos() { + public ImageRegistryConfigStorageIBMCOS getIbmcos() { return ibmcos; } @JsonProperty("ibmcos") - public void setIbmcos(ConfigStatusSIbmcos ibmcos) { + public void setIbmcos(ImageRegistryConfigStorageIBMCOS ibmcos) { this.ibmcos = ibmcos; } @@ -156,52 +154,52 @@ public void setManagementState(String managementState) { } @JsonProperty("oss") - public ConfigStatusSOss getOss() { + public ImageRegistryConfigStorageAlibabaOSS getOss() { return oss; } @JsonProperty("oss") - public void setOss(ConfigStatusSOss oss) { + public void setOss(ImageRegistryConfigStorageAlibabaOSS oss) { this.oss = oss; } @JsonProperty("pvc") - public ConfigStatusSPvc getPvc() { + public ImageRegistryConfigStoragePVC getPvc() { return pvc; } @JsonProperty("pvc") - public void setPvc(ConfigStatusSPvc pvc) { + public void setPvc(ImageRegistryConfigStoragePVC pvc) { this.pvc = pvc; } @JsonProperty("s3") - public ConfigStatusSS3 getS3() { + public ImageRegistryConfigStorageS3 getS3() { return s3; } @JsonProperty("s3") - public void setS3(ConfigStatusSS3 s3) { + public void setS3(ImageRegistryConfigStorageS3 s3) { this.s3 = s3; } @JsonProperty("swift") - public ConfigStatusSSwift getSwift() { + public ImageRegistryConfigStorageSwift getSwift() { return swift; } @JsonProperty("swift") - public void setSwift(ConfigStatusSSwift swift) { + public void setSwift(ImageRegistryConfigStorageSwift swift) { this.swift = swift; } @JsonIgnore - public ConfigStatusStorageBuilder edit() { - return new ConfigStatusStorageBuilder(this); + public ImageRegistryConfigStorageBuilder edit() { + return new ImageRegistryConfigStorageBuilder(this); } @JsonIgnore - public ConfigStatusStorageBuilder toBuilder() { + public ImageRegistryConfigStorageBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOss.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageAlibabaOSS.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOss.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageAlibabaOSS.java index 7d8e0951fda..226296ae41d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOss.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageAlibabaOSS.java @@ -54,13 +54,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusSOss implements Editable , KubernetesResource +public class ImageRegistryConfigStorageAlibabaOSS implements Editable , KubernetesResource { @JsonProperty("bucket") private String bucket; @JsonProperty("encryption") - private ConfigStatusSOEncryption encryption; + private EncryptionAlibaba encryption; @JsonProperty("endpointAccessibility") private String endpointAccessibility; @JsonProperty("region") @@ -72,10 +72,10 @@ public class ConfigStatusSOss implements Editable , Kub * No args constructor for use in serialization * */ - public ConfigStatusSOss() { + public ImageRegistryConfigStorageAlibabaOSS() { } - public ConfigStatusSOss(String bucket, ConfigStatusSOEncryption encryption, String endpointAccessibility, String region) { + public ImageRegistryConfigStorageAlibabaOSS(String bucket, EncryptionAlibaba encryption, String endpointAccessibility, String region) { super(); this.bucket = bucket; this.encryption = encryption; @@ -94,12 +94,12 @@ public void setBucket(String bucket) { } @JsonProperty("encryption") - public ConfigStatusSOEncryption getEncryption() { + public EncryptionAlibaba getEncryption() { return encryption; } @JsonProperty("encryption") - public void setEncryption(ConfigStatusSOEncryption encryption) { + public void setEncryption(EncryptionAlibaba encryption) { this.encryption = encryption; } @@ -124,12 +124,12 @@ public void setRegion(String region) { } @JsonIgnore - public ConfigStatusSOssBuilder edit() { - return new ConfigStatusSOssBuilder(this); + public ImageRegistryConfigStorageAlibabaOSSBuilder edit() { + return new ImageRegistryConfigStorageAlibabaOSSBuilder(this); } @JsonIgnore - public ConfigStatusSOssBuilder toBuilder() { + public ImageRegistryConfigStorageAlibabaOSSBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzure.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageAzure.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzure.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageAzure.java index d5429f5528c..b83e69e62f1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSAzure.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageAzure.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusSAzure implements Editable , KubernetesResource +public class ImageRegistryConfigStorageAzure implements Editable , KubernetesResource { @JsonProperty("accountName") @@ -64,7 +64,7 @@ public class ConfigStatusSAzure implements Editable , @JsonProperty("container") private String container; @JsonProperty("networkAccess") - private ConfigStatusSAzureNetworkAccess networkAccess; + private AzureNetworkAccess networkAccess; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class ConfigStatusSAzure implements Editable , * No args constructor for use in serialization * */ - public ConfigStatusSAzure() { + public ImageRegistryConfigStorageAzure() { } - public ConfigStatusSAzure(String accountName, String cloudName, String container, ConfigStatusSAzureNetworkAccess networkAccess) { + public ImageRegistryConfigStorageAzure(String accountName, String cloudName, String container, AzureNetworkAccess networkAccess) { super(); this.accountName = accountName; this.cloudName = cloudName; @@ -114,22 +114,22 @@ public void setContainer(String container) { } @JsonProperty("networkAccess") - public ConfigStatusSAzureNetworkAccess getNetworkAccess() { + public AzureNetworkAccess getNetworkAccess() { return networkAccess; } @JsonProperty("networkAccess") - public void setNetworkAccess(ConfigStatusSAzureNetworkAccess networkAccess) { + public void setNetworkAccess(AzureNetworkAccess networkAccess) { this.networkAccess = networkAccess; } @JsonIgnore - public ConfigStatusSAzureBuilder edit() { - return new ConfigStatusSAzureBuilder(this); + public ImageRegistryConfigStorageAzureBuilder edit() { + return new ImageRegistryConfigStorageAzureBuilder(this); } @JsonIgnore - public ConfigStatusSAzureBuilder toBuilder() { + public ImageRegistryConfigStorageAzureBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageEmptyDir.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageEmptyDir.java new file mode 100644 index 00000000000..aabf795c8dd --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageEmptyDir.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.operator.imageregistry.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ImageRegistryConfigStorageEmptyDir implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public ImageRegistryConfigStorageEmptyDirBuilder edit() { + return new ImageRegistryConfigStorageEmptyDirBuilder(this); + } + + @JsonIgnore + public ImageRegistryConfigStorageEmptyDirBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSGcs.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageGCS.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSGcs.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageGCS.java index 4d101c2af3f..82b1161e72d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSGcs.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageGCS.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSGcs implements Editable , KubernetesResource +public class ImageRegistryConfigStorageGCS implements Editable , KubernetesResource { @JsonProperty("bucket") @@ -72,10 +72,10 @@ public class ConfigSpecSGcs implements Editable , Kuberne * No args constructor for use in serialization * */ - public ConfigSpecSGcs() { + public ImageRegistryConfigStorageGCS() { } - public ConfigSpecSGcs(String bucket, String keyID, String projectID, String region) { + public ImageRegistryConfigStorageGCS(String bucket, String keyID, String projectID, String region) { super(); this.bucket = bucket; this.keyID = keyID; @@ -124,12 +124,12 @@ public void setRegion(String region) { } @JsonIgnore - public ConfigSpecSGcsBuilder edit() { - return new ConfigSpecSGcsBuilder(this); + public ImageRegistryConfigStorageGCSBuilder edit() { + return new ImageRegistryConfigStorageGCSBuilder(this); } @JsonIgnore - public ConfigSpecSGcsBuilder toBuilder() { + public ImageRegistryConfigStorageGCSBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSIbmcos.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageIBMCOS.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSIbmcos.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageIBMCOS.java index 1443c6cba11..46e701df913 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSIbmcos.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageIBMCOS.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSIbmcos implements Editable , KubernetesResource +public class ImageRegistryConfigStorageIBMCOS implements Editable , KubernetesResource { @JsonProperty("bucket") @@ -75,10 +75,10 @@ public class ConfigSpecSIbmcos implements Editable , K * No args constructor for use in serialization * */ - public ConfigSpecSIbmcos() { + public ImageRegistryConfigStorageIBMCOS() { } - public ConfigSpecSIbmcos(String bucket, String location, String resourceGroupName, String resourceKeyCRN, String serviceInstanceCRN) { + public ImageRegistryConfigStorageIBMCOS(String bucket, String location, String resourceGroupName, String resourceKeyCRN, String serviceInstanceCRN) { super(); this.bucket = bucket; this.location = location; @@ -138,12 +138,12 @@ public void setServiceInstanceCRN(String serviceInstanceCRN) { } @JsonIgnore - public ConfigSpecSIbmcosBuilder edit() { - return new ConfigSpecSIbmcosBuilder(this); + public ImageRegistryConfigStorageIBMCOSBuilder edit() { + return new ImageRegistryConfigStorageIBMCOSBuilder(this); } @JsonIgnore - public ConfigSpecSIbmcosBuilder toBuilder() { + public ImageRegistryConfigStorageIBMCOSBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSPvc.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStoragePVC.java similarity index 88% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSPvc.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStoragePVC.java index 6c0ef4e3f3a..3feba6fc112 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSPvc.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStoragePVC.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusSPvc implements Editable , KubernetesResource +public class ImageRegistryConfigStoragePVC implements Editable , KubernetesResource { @JsonProperty("claim") @@ -63,10 +63,10 @@ public class ConfigStatusSPvc implements Editable , Kub * No args constructor for use in serialization * */ - public ConfigStatusSPvc() { + public ImageRegistryConfigStoragePVC() { } - public ConfigStatusSPvc(String claim) { + public ImageRegistryConfigStoragePVC(String claim) { super(); this.claim = claim; } @@ -82,12 +82,12 @@ public void setClaim(String claim) { } @JsonIgnore - public ConfigStatusSPvcBuilder edit() { - return new ConfigStatusSPvcBuilder(this); + public ImageRegistryConfigStoragePVCBuilder edit() { + return new ImageRegistryConfigStoragePVCBuilder(this); } @JsonIgnore - public ConfigStatusSPvcBuilder toBuilder() { + public ImageRegistryConfigStoragePVCBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSS3.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageS3.java similarity index 80% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSS3.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageS3.java index 40f9ad7f615..1ae4222bcd1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSS3.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageS3.java @@ -32,6 +32,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "bucket", + "chunkSizeMiB", "cloudFront", "encrypt", "keyID", @@ -58,13 +59,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSS3 implements Editable , KubernetesResource +public class ImageRegistryConfigStorageS3 implements Editable , KubernetesResource { @JsonProperty("bucket") private String bucket; + @JsonProperty("chunkSizeMiB") + private Integer chunkSizeMiB; @JsonProperty("cloudFront") - private ConfigSpecSSCloudFront cloudFront; + private ImageRegistryConfigStorageS3CloudFront cloudFront; @JsonProperty("encrypt") private Boolean encrypt; @JsonProperty("keyID") @@ -74,7 +77,7 @@ public class ConfigSpecSS3 implements Editable , Kubernete @JsonProperty("regionEndpoint") private String regionEndpoint; @JsonProperty("trustedCA") - private ConfigSpecSSTrustedCA trustedCA; + private S3TrustedCASource trustedCA; @JsonProperty("virtualHostedStyle") private Boolean virtualHostedStyle; @JsonIgnore @@ -84,12 +87,13 @@ public class ConfigSpecSS3 implements Editable , Kubernete * No args constructor for use in serialization * */ - public ConfigSpecSS3() { + public ImageRegistryConfigStorageS3() { } - public ConfigSpecSS3(String bucket, ConfigSpecSSCloudFront cloudFront, Boolean encrypt, String keyID, String region, String regionEndpoint, ConfigSpecSSTrustedCA trustedCA, Boolean virtualHostedStyle) { + public ImageRegistryConfigStorageS3(String bucket, Integer chunkSizeMiB, ImageRegistryConfigStorageS3CloudFront cloudFront, Boolean encrypt, String keyID, String region, String regionEndpoint, S3TrustedCASource trustedCA, Boolean virtualHostedStyle) { super(); this.bucket = bucket; + this.chunkSizeMiB = chunkSizeMiB; this.cloudFront = cloudFront; this.encrypt = encrypt; this.keyID = keyID; @@ -109,13 +113,23 @@ public void setBucket(String bucket) { this.bucket = bucket; } + @JsonProperty("chunkSizeMiB") + public Integer getChunkSizeMiB() { + return chunkSizeMiB; + } + + @JsonProperty("chunkSizeMiB") + public void setChunkSizeMiB(Integer chunkSizeMiB) { + this.chunkSizeMiB = chunkSizeMiB; + } + @JsonProperty("cloudFront") - public ConfigSpecSSCloudFront getCloudFront() { + public ImageRegistryConfigStorageS3CloudFront getCloudFront() { return cloudFront; } @JsonProperty("cloudFront") - public void setCloudFront(ConfigSpecSSCloudFront cloudFront) { + public void setCloudFront(ImageRegistryConfigStorageS3CloudFront cloudFront) { this.cloudFront = cloudFront; } @@ -160,12 +174,12 @@ public void setRegionEndpoint(String regionEndpoint) { } @JsonProperty("trustedCA") - public ConfigSpecSSTrustedCA getTrustedCA() { + public S3TrustedCASource getTrustedCA() { return trustedCA; } @JsonProperty("trustedCA") - public void setTrustedCA(ConfigSpecSSTrustedCA trustedCA) { + public void setTrustedCA(S3TrustedCASource trustedCA) { this.trustedCA = trustedCA; } @@ -180,12 +194,12 @@ public void setVirtualHostedStyle(Boolean virtualHostedStyle) { } @JsonIgnore - public ConfigSpecSS3Builder edit() { - return new ConfigSpecSS3Builder(this); + public ImageRegistryConfigStorageS3Builder edit() { + return new ImageRegistryConfigStorageS3Builder(this); } @JsonIgnore - public ConfigSpecSS3Builder toBuilder() { + public ImageRegistryConfigStorageS3Builder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSCloudFront.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageS3CloudFront.java similarity index 84% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSCloudFront.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageS3CloudFront.java index 2644aa2263c..3cd5a9f11e7 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSCloudFront.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryConfigStorageS3CloudFront.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -54,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSSCloudFront implements Editable , KubernetesResource +public class ImageRegistryConfigStorageS3CloudFront implements Editable , KubernetesResource { @JsonProperty("baseURL") @@ -64,7 +65,7 @@ public class ConfigSpecSSCloudFront implements Editable additionalProperties = new LinkedHashMap(); @@ -72,10 +73,10 @@ public class ConfigSpecSSCloudFront implements Editable , KubernetesResource +public class ImageRegistryConfigStorageSwift implements Editable , KubernetesResource { @JsonProperty("authURL") @@ -84,10 +84,10 @@ public class ConfigStatusSSwift implements Editable , * No args constructor for use in serialization * */ - public ConfigStatusSSwift() { + public ImageRegistryConfigStorageSwift() { } - public ConfigStatusSSwift(String authURL, String authVersion, String container, String domain, String domainID, String regionName, String tenant, String tenantID) { + public ImageRegistryConfigStorageSwift(String authURL, String authVersion, String container, String domain, String domainID, String regionName, String tenant, String tenantID) { super(); this.authURL = authURL; this.authVersion = authVersion; @@ -180,12 +180,12 @@ public void setTenantID(String tenantID) { } @JsonIgnore - public ConfigStatusSSwiftBuilder edit() { - return new ConfigStatusSSwiftBuilder(this); + public ImageRegistryConfigStorageSwiftBuilder edit() { + return new ImageRegistryConfigStorageSwiftBuilder(this); } @JsonIgnore - public ConfigStatusSSwiftBuilder toBuilder() { + public ImageRegistryConfigStorageSwiftBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistrySpec.java similarity index 81% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpec.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistrySpec.java index f78d845d906..620584f09b1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistrySpec.java @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Affinity; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -24,6 +25,8 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.Toleration; +import io.fabric8.kubernetes.api.model.TopologySpreadConstraint; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -73,11 +76,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpec implements Editable , KubernetesResource +public class ImageRegistrySpec implements Editable , KubernetesResource { @JsonProperty("affinity") - private ConfigSpecAffinity affinity; + private Affinity affinity; @JsonProperty("defaultRoute") private Boolean defaultRoute; @JsonProperty("disableRedirect") @@ -99,28 +102,28 @@ public class ConfigSpec implements Editable , KubernetesResou @JsonProperty("operatorLogLevel") private String operatorLogLevel; @JsonProperty("proxy") - private ConfigSpecProxy proxy; + private ImageRegistryConfigProxy proxy; @JsonProperty("readOnly") private Boolean readOnly; @JsonProperty("replicas") private Integer replicas; @JsonProperty("requests") - private ConfigSpecRequests requests; + private ImageRegistryConfigRequests requests; @JsonProperty("resources") - private ConfigSpecResources resources; + private ResourceRequirements resources; @JsonProperty("rolloutStrategy") private String rolloutStrategy; @JsonProperty("routes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List routes = new ArrayList<>(); + private List routes = new ArrayList<>(); @JsonProperty("storage") - private ConfigSpecStorage storage; + private ImageRegistryConfigStorage storage; @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonProperty("topologySpreadConstraints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List topologySpreadConstraints = new ArrayList<>(); + private List topologySpreadConstraints = new ArrayList<>(); @JsonProperty("unsupportedConfigOverrides") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) private Object unsupportedConfigOverrides; @@ -131,10 +134,10 @@ public class ConfigSpec implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public ConfigSpec() { + public ImageRegistrySpec() { } - public ConfigSpec(ConfigSpecAffinity affinity, Boolean defaultRoute, Boolean disableRedirect, String httpSecret, String logLevel, Long logging, String managementState, Map nodeSelector, Object observedConfig, String operatorLogLevel, ConfigSpecProxy proxy, Boolean readOnly, Integer replicas, ConfigSpecRequests requests, ConfigSpecResources resources, String rolloutStrategy, List routes, ConfigSpecStorage storage, List tolerations, List topologySpreadConstraints, Object unsupportedConfigOverrides) { + public ImageRegistrySpec(Affinity affinity, Boolean defaultRoute, Boolean disableRedirect, String httpSecret, String logLevel, Long logging, String managementState, Map nodeSelector, Object observedConfig, String operatorLogLevel, ImageRegistryConfigProxy proxy, Boolean readOnly, Integer replicas, ImageRegistryConfigRequests requests, ResourceRequirements resources, String rolloutStrategy, List routes, ImageRegistryConfigStorage storage, List tolerations, List topologySpreadConstraints, Object unsupportedConfigOverrides) { super(); this.affinity = affinity; this.defaultRoute = defaultRoute; @@ -160,12 +163,12 @@ public ConfigSpec(ConfigSpecAffinity affinity, Boolean defaultRoute, Boolean dis } @JsonProperty("affinity") - public ConfigSpecAffinity getAffinity() { + public Affinity getAffinity() { return affinity; } @JsonProperty("affinity") - public void setAffinity(ConfigSpecAffinity affinity) { + public void setAffinity(Affinity affinity) { this.affinity = affinity; } @@ -262,12 +265,12 @@ public void setOperatorLogLevel(String operatorLogLevel) { } @JsonProperty("proxy") - public ConfigSpecProxy getProxy() { + public ImageRegistryConfigProxy getProxy() { return proxy; } @JsonProperty("proxy") - public void setProxy(ConfigSpecProxy proxy) { + public void setProxy(ImageRegistryConfigProxy proxy) { this.proxy = proxy; } @@ -292,22 +295,22 @@ public void setReplicas(Integer replicas) { } @JsonProperty("requests") - public ConfigSpecRequests getRequests() { + public ImageRegistryConfigRequests getRequests() { return requests; } @JsonProperty("requests") - public void setRequests(ConfigSpecRequests requests) { + public void setRequests(ImageRegistryConfigRequests requests) { this.requests = requests; } @JsonProperty("resources") - public ConfigSpecResources getResources() { + public ResourceRequirements getResources() { return resources; } @JsonProperty("resources") - public void setResources(ConfigSpecResources resources) { + public void setResources(ResourceRequirements resources) { this.resources = resources; } @@ -323,44 +326,44 @@ public void setRolloutStrategy(String rolloutStrategy) { @JsonProperty("routes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRoutes() { + public List getRoutes() { return routes; } @JsonProperty("routes") - public void setRoutes(List routes) { + public void setRoutes(List routes) { this.routes = routes; } @JsonProperty("storage") - public ConfigSpecStorage getStorage() { + public ImageRegistryConfigStorage getStorage() { return storage; } @JsonProperty("storage") - public void setStorage(ConfigSpecStorage storage) { + public void setStorage(ImageRegistryConfigStorage storage) { this.storage = storage; } @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } @JsonProperty("topologySpreadConstraints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTopologySpreadConstraints() { + public List getTopologySpreadConstraints() { return topologySpreadConstraints; } @JsonProperty("topologySpreadConstraints") - public void setTopologySpreadConstraints(List topologySpreadConstraints) { + public void setTopologySpreadConstraints(List topologySpreadConstraints) { this.topologySpreadConstraints = topologySpreadConstraints; } @@ -376,12 +379,12 @@ public void setUnsupportedConfigOverrides(Object unsupportedConfigOverrides) { } @JsonIgnore - public ConfigSpecBuilder edit() { - return new ConfigSpecBuilder(this); + public ImageRegistrySpecBuilder edit() { + return new ImageRegistrySpecBuilder(this); } @JsonIgnore - public ConfigSpecBuilder toBuilder() { + public ImageRegistrySpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryStatus.java similarity index 75% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatus.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryStatus.java index 9f7216156a5..d3166efacab 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImageRegistryStatus.java @@ -24,6 +24,8 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.operator.v1.GenerationStatus; +import io.fabric8.openshift.api.model.operator.v1.OperatorCondition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -35,6 +37,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "observedGeneration", "readyReplicas", "storage", @@ -59,21 +62,23 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatus implements Editable , KubernetesResource +public class ImageRegistryStatus implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") private Integer readyReplicas; @JsonProperty("storage") - private ConfigStatusStorage storage; + private ImageRegistryConfigStorage storage; @JsonProperty("storageManaged") private Boolean storageManaged; @JsonProperty("version") @@ -85,13 +90,14 @@ public class ConfigStatus implements Editable , KubernetesR * No args constructor for use in serialization * */ - public ConfigStatus() { + public ImageRegistryStatus() { } - public ConfigStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, ConfigStatusStorage storage, Boolean storageManaged, String version) { + public ImageRegistryStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, ImageRegistryConfigStorage storage, Boolean storageManaged, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.storage = storage; @@ -101,26 +107,36 @@ public ConfigStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; @@ -142,12 +158,12 @@ public void setReadyReplicas(Integer readyReplicas) { } @JsonProperty("storage") - public ConfigStatusStorage getStorage() { + public ImageRegistryConfigStorage getStorage() { return storage; } @JsonProperty("storage") - public void setStorage(ConfigStatusStorage storage) { + public void setStorage(ImageRegistryConfigStorage storage) { this.storage = storage; } @@ -172,12 +188,12 @@ public void setVersion(String version) { } @JsonIgnore - public ConfigStatusBuilder edit() { - return new ConfigStatusBuilder(this); + public ImageRegistryStatusBuilder edit() { + return new ImageRegistryStatusBuilder(this); } @JsonIgnore - public ConfigStatusBuilder toBuilder() { + public ImageRegistryStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOEKms.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/KMSEncryptionAlibaba.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOEKms.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/KMSEncryptionAlibaba.java index 98ce66f17b9..634ca6a9553 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigStatusSOEKms.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/KMSEncryptionAlibaba.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusSOEKms implements Editable , KubernetesResource +public class KMSEncryptionAlibaba implements Editable , KubernetesResource { @JsonProperty("keyID") @@ -63,10 +63,10 @@ public class ConfigStatusSOEKms implements Editable , * No args constructor for use in serialization * */ - public ConfigStatusSOEKms() { + public KMSEncryptionAlibaba() { } - public ConfigStatusSOEKms(String keyID) { + public KMSEncryptionAlibaba(String keyID) { super(); this.keyID = keyID; } @@ -82,12 +82,12 @@ public void setKeyID(String keyID) { } @JsonIgnore - public ConfigStatusSOEKmsBuilder edit() { - return new ConfigStatusSOEKmsBuilder(this); + public KMSEncryptionAlibabaBuilder edit() { + return new KMSEncryptionAlibabaBuilder(this); } @JsonIgnore - public ConfigStatusSOEKmsBuilder toBuilder() { + public KMSEncryptionAlibabaBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSTrustedCA.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/S3TrustedCASource.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSTrustedCA.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/S3TrustedCASource.java index 267d4f28e9a..d37ca83ac3b 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSSTrustedCA.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/S3TrustedCASource.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSSTrustedCA implements Editable , KubernetesResource +public class S3TrustedCASource implements Editable , KubernetesResource { @JsonProperty("name") @@ -63,10 +63,10 @@ public class ConfigSpecSSTrustedCA implements Editable , Kuber private Long observedGeneration; @JsonProperty("zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List zones = new ArrayList<>(); + private List zones = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,7 +72,7 @@ public class DNSRecordStatus implements Editable , Kuber public DNSRecordStatus() { } - public DNSRecordStatus(Long observedGeneration, List zones) { + public DNSRecordStatus(Long observedGeneration, List zones) { super(); this.observedGeneration = observedGeneration; this.zones = zones; @@ -90,12 +90,12 @@ public void setObservedGeneration(Long observedGeneration) { @JsonProperty("zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getZones() { + public List getZones() { return zones; } @JsonProperty("zones") - public void setZones(List zones) { + public void setZones(List zones) { this.zones = zones; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSRecordStatusZDnsZone.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSRecordStatusZDnsZone.java deleted file mode 100644 index 8f8fbc03d56..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSRecordStatusZDnsZone.java +++ /dev/null @@ -1,124 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.ingress.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "id", - "tags" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class DNSRecordStatusZDnsZone implements Editable , KubernetesResource -{ - - @JsonProperty("id") - private String id; - @JsonProperty("tags") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map tags = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public DNSRecordStatusZDnsZone() { - } - - public DNSRecordStatusZDnsZone(String id, Map tags) { - super(); - this.id = id; - this.tags = tags; - } - - @JsonProperty("id") - public String getId() { - return id; - } - - @JsonProperty("id") - public void setId(String id) { - this.id = id; - } - - @JsonProperty("tags") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getTags() { - return tags; - } - - @JsonProperty("tags") - public void setTags(Map tags) { - this.tags = tags; - } - - @JsonIgnore - public DNSRecordStatusZDnsZoneBuilder edit() { - return new DNSRecordStatusZDnsZoneBuilder(this); - } - - @JsonIgnore - public DNSRecordStatusZDnsZoneBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSRecordStatusZConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSZoneCondition.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSRecordStatusZConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSZoneCondition.java index af7266d82e6..dfa25dc3e28 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSRecordStatusZConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/ingress/v1/DNSZoneCondition.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSRecordStatusZConditions implements Editable , KubernetesResource +public class DNSZoneCondition implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class DNSRecordStatusZConditions implements Editable , KubernetesResource +public class DNSZoneStatus implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("dnsZone") - private DNSRecordStatusZDnsZone dnsZone; + private DNSZone dnsZone; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +70,10 @@ public class DNSRecordStatusZones implements Editable conditions, DNSRecordStatusZDnsZone dnsZone) { + public DNSZoneStatus(List conditions, DNSZone dnsZone) { super(); this.conditions = conditions; this.dnsZone = dnsZone; @@ -80,32 +81,32 @@ public DNSRecordStatusZones(List conditions, DNSReco @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("dnsZone") - public DNSRecordStatusZDnsZone getDnsZone() { + public DNSZone getDnsZone() { return dnsZone; } @JsonProperty("dnsZone") - public void setDnsZone(DNSRecordStatusZDnsZone dnsZone) { + public void setDnsZone(DNSZone dnsZone) { this.dnsZone = dnsZone; } @JsonIgnore - public DNSRecordStatusZonesBuilder edit() { - return new DNSRecordStatusZonesBuilder(this); + public DNSZoneStatusBuilder edit() { + return new DNSZoneStatusBuilder(this); } @JsonIgnore - public DNSRecordStatusZonesBuilder toBuilder() { + public DNSZoneStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpecTargetCert.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/CertSpec.java similarity index 89% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpecTargetCert.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/CertSpec.java index 85800fa2382..0639ba83a01 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpecTargetCert.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/CertSpec.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OperatorPKISpecTargetCert implements Editable , KubernetesResource +public class CertSpec implements Editable , KubernetesResource { @JsonProperty("commonName") @@ -63,10 +63,10 @@ public class OperatorPKISpecTargetCert implements Editable , KubernetesResource +public class EgressRouterAddress implements Editable , KubernetesResource { @JsonProperty("gateway") @@ -66,10 +66,10 @@ public class EgressRouterSpecAddresses implements Editable , KubernetesResource +public class EgressRouterInterface implements Editable , KubernetesResource { @JsonProperty("macvlan") - private EgressRouterSpecNIMacvlan macvlan; + private MacvlanConfig macvlan; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class EgressRouterSpecNetworkInterface implements Editable , Kub @JsonProperty("addresses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List addresses = new ArrayList<>(); + private List addresses = new ArrayList<>(); @JsonProperty("mode") private String mode; @JsonProperty("networkInterface") - private EgressRouterSpecNetworkInterface networkInterface; + private EgressRouterInterface networkInterface; @JsonProperty("redirect") - private EgressRouterSpecRedirect redirect; + private RedirectConfig redirect; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -78,7 +78,7 @@ public class EgressRouterSpec implements Editable , Kub public EgressRouterSpec() { } - public EgressRouterSpec(List addresses, String mode, EgressRouterSpecNetworkInterface networkInterface, EgressRouterSpecRedirect redirect) { + public EgressRouterSpec(List addresses, String mode, EgressRouterInterface networkInterface, RedirectConfig redirect) { super(); this.addresses = addresses; this.mode = mode; @@ -88,12 +88,12 @@ public EgressRouterSpec(List addresses, String mode, @JsonProperty("addresses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAddresses() { + public List getAddresses() { return addresses; } @JsonProperty("addresses") - public void setAddresses(List addresses) { + public void setAddresses(List addresses) { this.addresses = addresses; } @@ -108,22 +108,22 @@ public void setMode(String mode) { } @JsonProperty("networkInterface") - public EgressRouterSpecNetworkInterface getNetworkInterface() { + public EgressRouterInterface getNetworkInterface() { return networkInterface; } @JsonProperty("networkInterface") - public void setNetworkInterface(EgressRouterSpecNetworkInterface networkInterface) { + public void setNetworkInterface(EgressRouterInterface networkInterface) { this.networkInterface = networkInterface; } @JsonProperty("redirect") - public EgressRouterSpecRedirect getRedirect() { + public RedirectConfig getRedirect() { return redirect; } @JsonProperty("redirect") - public void setRedirect(EgressRouterSpecRedirect redirect) { + public void setRedirect(RedirectConfig redirect) { this.redirect = redirect; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatus.java index 9c0c4264697..91f82c9e755 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatus.java @@ -58,7 +58,7 @@ public class EgressRouterStatus implements Editable , @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,19 +69,19 @@ public class EgressRouterStatus implements Editable , public EgressRouterStatus() { } - public EgressRouterStatus(List conditions) { + public EgressRouterStatus(List conditions) { super(); this.conditions = conditions; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatusCondition.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatusCondition.java index 2e862f41bb8..1a36f66b3ad 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ImagePrunerStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterStatusCondition.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.imageregistry.v1; +package io.fabric8.openshift.api.model.operator.network.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImagePrunerStatusConditions implements Editable , KubernetesResource +public class EgressRouterStatusCondition implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class ImagePrunerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public EgressRouterStatusConditions() { - } - - public EgressRouterStatusConditions(Object lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public Object getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setLastTransitionTime(Object lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public EgressRouterStatusConditionsBuilder edit() { - return new EgressRouterStatusConditionsBuilder(this); - } - - @JsonIgnore - public EgressRouterStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterSpecRRedirectRules.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/L4RedirectRule.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterSpecRRedirectRules.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/L4RedirectRule.java index 00d61184f2f..b3b47f2043d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterSpecRRedirectRules.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/L4RedirectRule.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EgressRouterSpecRRedirectRules implements Editable , KubernetesResource +public class L4RedirectRule implements Editable , KubernetesResource { @JsonProperty("destinationIP") @@ -72,10 +72,10 @@ public class EgressRouterSpecRRedirectRules implements Editable , KubernetesResource +public class MacvlanConfig implements Editable , KubernetesResource { @JsonProperty("master") @@ -66,10 +66,10 @@ public class EgressRouterSpecNIMacvlan implements Editable , HasMetadata, @JsonProperty("spec") private OperatorPKISpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private OperatorPKIStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -99,7 +98,7 @@ public class OperatorPKI implements Editable , HasMetadata, public OperatorPKI() { } - public OperatorPKI(String apiVersion, String kind, ObjectMeta metadata, OperatorPKISpec spec, Object status) { + public OperatorPKI(String apiVersion, String kind, ObjectMeta metadata, OperatorPKISpec spec, OperatorPKIStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -169,13 +168,12 @@ public void setSpec(OperatorPKISpec spec) { } @JsonProperty("status") - public Object getStatus() { + public OperatorPKIStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(OperatorPKIStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpec.java index 3bdc3e7ce01..2671bbc38b0 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKISpec.java @@ -55,7 +55,7 @@ public class OperatorPKISpec implements Editable , Kuber { @JsonProperty("targetCert") - private OperatorPKISpecTargetCert targetCert; + private CertSpec targetCert; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,18 +66,18 @@ public class OperatorPKISpec implements Editable , Kuber public OperatorPKISpec() { } - public OperatorPKISpec(OperatorPKISpecTargetCert targetCert) { + public OperatorPKISpec(CertSpec targetCert) { super(); this.targetCert = targetCert; } @JsonProperty("targetCert") - public OperatorPKISpecTargetCert getTargetCert() { + public CertSpec getTargetCert() { return targetCert; } @JsonProperty("targetCert") - public void setTargetCert(OperatorPKISpecTargetCert targetCert) { + public void setTargetCert(CertSpec targetCert) { this.targetCert = targetCert; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKIStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKIStatus.java new file mode 100644 index 00000000000..a30689cc0b1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/OperatorPKIStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.operator.network.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class OperatorPKIStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public OperatorPKIStatusBuilder edit() { + return new OperatorPKIStatusBuilder(this); + } + + @JsonIgnore + public OperatorPKIStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterSpecRedirect.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/RedirectConfig.java similarity index 84% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterSpecRedirect.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/RedirectConfig.java index 4e92be117f1..9d48a00f14e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterSpecRedirect.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/network/v1/RedirectConfig.java @@ -54,14 +54,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EgressRouterSpecRedirect implements Editable , KubernetesResource +public class RedirectConfig implements Editable , KubernetesResource { @JsonProperty("fallbackIP") private String fallbackIP; @JsonProperty("redirectRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List redirectRules = new ArrayList<>(); + private List redirectRules = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class EgressRouterSpecRedirect implements Editable redirectRules) { + public RedirectConfig(String fallbackIP, List redirectRules) { super(); this.fallbackIP = fallbackIP; this.redirectRules = redirectRules; @@ -90,22 +90,22 @@ public void setFallbackIP(String fallbackIP) { @JsonProperty("redirectRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRedirectRules() { + public List getRedirectRules() { return redirectRules; } @JsonProperty("redirectRules") - public void setRedirectRules(List redirectRules) { + public void setRedirectRules(List redirectRules) { this.redirectRules = redirectRules; } @JsonIgnore - public EgressRouterSpecRedirectBuilder edit() { - return new EgressRouterSpecRedirectBuilder(this); + public RedirectConfigBuilder edit() { + return new RedirectConfigBuilder(this); } @JsonIgnore - public EgressRouterSpecRedirectBuilder toBuilder() { + public RedirectConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCAws.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java similarity index 79% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCAws.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java index 70ced7d8013..e63cd3cb5a4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCAws.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java @@ -31,6 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ + "efsVolumeMetrics", "kmsKeyARN" }) @ToString @@ -51,9 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterCSIDriverSpecDCAws implements Editable , KubernetesResource +public class AWSCSIDriverConfigSpec implements Editable , KubernetesResource { + @JsonProperty("efsVolumeMetrics") + private AWSEFSVolumeMetrics efsVolumeMetrics; @JsonProperty("kmsKeyARN") private String kmsKeyARN; @JsonIgnore @@ -63,14 +66,25 @@ public class ClusterCSIDriverSpecDCAws implements Editable , KubernetesResource +public class AWSClassicLoadBalancerParameters implements Editable , KubernetesResource { @JsonProperty("connectionIdleTimeout") private String connectionIdleTimeout; + @JsonProperty("subnets") + private AWSSubnets subnets; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,12 +66,13 @@ public class IngressControllerStatusEPSLBPPAwsClassicLoadBalancer implements Edi * No args constructor for use in serialization * */ - public IngressControllerStatusEPSLBPPAwsClassicLoadBalancer() { + public AWSClassicLoadBalancerParameters() { } - public IngressControllerStatusEPSLBPPAwsClassicLoadBalancer(String connectionIdleTimeout) { + public AWSClassicLoadBalancerParameters(String connectionIdleTimeout, AWSSubnets subnets) { super(); this.connectionIdleTimeout = connectionIdleTimeout; + this.subnets = subnets; } @JsonProperty("connectionIdleTimeout") @@ -81,13 +85,23 @@ public void setConnectionIdleTimeout(String connectionIdleTimeout) { this.connectionIdleTimeout = connectionIdleTimeout; } + @JsonProperty("subnets") + public AWSSubnets getSubnets() { + return subnets; + } + + @JsonProperty("subnets") + public void setSubnets(AWSSubnets subnets) { + this.subnets = subnets; + } + @JsonIgnore - public IngressControllerStatusEPSLBPPAwsClassicLoadBalancerBuilder edit() { - return new IngressControllerStatusEPSLBPPAwsClassicLoadBalancerBuilder(this); + public AWSClassicLoadBalancerParametersBuilder edit() { + return new AWSClassicLoadBalancerParametersBuilder(this); } @JsonIgnore - public IngressControllerStatusEPSLBPPAwsClassicLoadBalancerBuilder toBuilder() { + public AWSClassicLoadBalancerParametersBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSEFSVolumeMetrics.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSEFSVolumeMetrics.java new file mode 100644 index 00000000000..85c3beca8e7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSEFSVolumeMetrics.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "recursiveWalk", + "state" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class AWSEFSVolumeMetrics implements Editable , KubernetesResource +{ + + @JsonProperty("recursiveWalk") + private AWSEFSVolumeMetricsRecursiveWalkConfig recursiveWalk; + @JsonProperty("state") + private String state; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AWSEFSVolumeMetrics() { + } + + public AWSEFSVolumeMetrics(AWSEFSVolumeMetricsRecursiveWalkConfig recursiveWalk, String state) { + super(); + this.recursiveWalk = recursiveWalk; + this.state = state; + } + + @JsonProperty("recursiveWalk") + public AWSEFSVolumeMetricsRecursiveWalkConfig getRecursiveWalk() { + return recursiveWalk; + } + + @JsonProperty("recursiveWalk") + public void setRecursiveWalk(AWSEFSVolumeMetricsRecursiveWalkConfig recursiveWalk) { + this.recursiveWalk = recursiveWalk; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @JsonIgnore + public AWSEFSVolumeMetricsBuilder edit() { + return new AWSEFSVolumeMetricsBuilder(this); + } + + @JsonIgnore + public AWSEFSVolumeMetricsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSEFSVolumeMetricsRecursiveWalkConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSEFSVolumeMetricsRecursiveWalkConfig.java new file mode 100644 index 00000000000..9fb83da4bed --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSEFSVolumeMetricsRecursiveWalkConfig.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "fsRateLimit", + "refreshPeriodMinutes" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class AWSEFSVolumeMetricsRecursiveWalkConfig implements Editable , KubernetesResource +{ + + @JsonProperty("fsRateLimit") + private Integer fsRateLimit; + @JsonProperty("refreshPeriodMinutes") + private Integer refreshPeriodMinutes; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AWSEFSVolumeMetricsRecursiveWalkConfig() { + } + + public AWSEFSVolumeMetricsRecursiveWalkConfig(Integer fsRateLimit, Integer refreshPeriodMinutes) { + super(); + this.fsRateLimit = fsRateLimit; + this.refreshPeriodMinutes = refreshPeriodMinutes; + } + + @JsonProperty("fsRateLimit") + public Integer getFsRateLimit() { + return fsRateLimit; + } + + @JsonProperty("fsRateLimit") + public void setFsRateLimit(Integer fsRateLimit) { + this.fsRateLimit = fsRateLimit; + } + + @JsonProperty("refreshPeriodMinutes") + public Integer getRefreshPeriodMinutes() { + return refreshPeriodMinutes; + } + + @JsonProperty("refreshPeriodMinutes") + public void setRefreshPeriodMinutes(Integer refreshPeriodMinutes) { + this.refreshPeriodMinutes = refreshPeriodMinutes; + } + + @JsonIgnore + public AWSEFSVolumeMetricsRecursiveWalkConfigBuilder edit() { + return new AWSEFSVolumeMetricsRecursiveWalkConfigBuilder(this); + } + + @JsonIgnore + public AWSEFSVolumeMetricsRecursiveWalkConfigBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLBPPAws.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSLoadBalancerParameters.java similarity index 77% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLBPPAws.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSLoadBalancerParameters.java index da96ac19e72..437477637e5 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLBPPAws.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSLoadBalancerParameters.java @@ -53,14 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecEPSLBPPAws implements Editable , KubernetesResource +public class AWSLoadBalancerParameters implements Editable , KubernetesResource { @JsonProperty("classicLoadBalancer") - private IngressControllerSpecEPSLBPPAwsClassicLoadBalancer classicLoadBalancer; + private AWSClassicLoadBalancerParameters classicLoadBalancer; @JsonProperty("networkLoadBalancer") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object networkLoadBalancer; + private AWSNetworkLoadBalancerParameters networkLoadBalancer; @JsonProperty("type") private String type; @JsonIgnore @@ -70,10 +69,10 @@ public class IngressControllerSpecEPSLBPPAws implements Editable , KubernetesResource +public class AWSNetworkLoadBalancerParameters implements Editable , KubernetesResource { - @JsonProperty("ciphers") + @JsonProperty("eipAllocations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List ciphers = new ArrayList<>(); - @JsonProperty("minTLSVersion") - private String minTLSVersion; + private List eipAllocations = new ArrayList<>(); + @JsonProperty("subnets") + private AWSSubnets subnets; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,43 +69,43 @@ public class IngressControllerStatusTlsProfile implements Editable ciphers, String minTLSVersion) { + public AWSNetworkLoadBalancerParameters(List eipAllocations, AWSSubnets subnets) { super(); - this.ciphers = ciphers; - this.minTLSVersion = minTLSVersion; + this.eipAllocations = eipAllocations; + this.subnets = subnets; } - @JsonProperty("ciphers") + @JsonProperty("eipAllocations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getCiphers() { - return ciphers; + public List getEipAllocations() { + return eipAllocations; } - @JsonProperty("ciphers") - public void setCiphers(List ciphers) { - this.ciphers = ciphers; + @JsonProperty("eipAllocations") + public void setEipAllocations(List eipAllocations) { + this.eipAllocations = eipAllocations; } - @JsonProperty("minTLSVersion") - public String getMinTLSVersion() { - return minTLSVersion; + @JsonProperty("subnets") + public AWSSubnets getSubnets() { + return subnets; } - @JsonProperty("minTLSVersion") - public void setMinTLSVersion(String minTLSVersion) { - this.minTLSVersion = minTLSVersion; + @JsonProperty("subnets") + public void setSubnets(AWSSubnets subnets) { + this.subnets = subnets; } @JsonIgnore - public IngressControllerStatusTlsProfileBuilder edit() { - return new IngressControllerStatusTlsProfileBuilder(this); + public AWSNetworkLoadBalancerParametersBuilder edit() { + return new AWSNetworkLoadBalancerParametersBuilder(this); } @JsonIgnore - public IngressControllerStatusTlsProfileBuilder toBuilder() { + public AWSNetworkLoadBalancerParametersBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSSubnets.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSSubnets.java new file mode 100644 index 00000000000..6068c04d026 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSSubnets.java @@ -0,0 +1,128 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "ids", + "names" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class AWSSubnets implements Editable , KubernetesResource +{ + + @JsonProperty("ids") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ids = new ArrayList<>(); + @JsonProperty("names") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List names = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AWSSubnets() { + } + + public AWSSubnets(List ids, List names) { + super(); + this.ids = ids; + this.names = names; + } + + @JsonProperty("ids") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getIds() { + return ids; + } + + @JsonProperty("ids") + public void setIds(List ids) { + this.ids = ids; + } + + @JsonProperty("names") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNames() { + return names; + } + + @JsonProperty("names") + public void setNames(List names) { + this.names = names; + } + + @JsonIgnore + public AWSSubnetsBuilder edit() { + return new AWSSubnetsBuilder(this); + } + + @JsonIgnore + public AWSSubnetsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLAccess.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AccessLogging.java similarity index 77% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLAccess.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AccessLogging.java index b407866e2ba..ea2b512ab50 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLAccess.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AccessLogging.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.operator.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -55,16 +57,16 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecLAccess implements Editable , KubernetesResource +public class AccessLogging implements Editable , KubernetesResource { @JsonProperty("destination") - private IngressControllerSpecLADestination destination; + private LoggingDestination destination; @JsonProperty("httpCaptureCookies") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object httpCaptureCookies; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List httpCaptureCookies = new ArrayList<>(); @JsonProperty("httpCaptureHeaders") - private IngressControllerSpecLAHttpCaptureHeaders httpCaptureHeaders; + private IngressControllerCaptureHTTPHeaders httpCaptureHeaders; @JsonProperty("httpLogFormat") private String httpLogFormat; @JsonProperty("logEmptyRequests") @@ -76,10 +78,10 @@ public class IngressControllerSpecLAccess implements Editable httpCaptureCookies, IngressControllerCaptureHTTPHeaders httpCaptureHeaders, String httpLogFormat, String logEmptyRequests) { super(); this.destination = destination; this.httpCaptureCookies = httpCaptureCookies; @@ -89,33 +91,33 @@ public IngressControllerSpecLAccess(IngressControllerSpecLADestination destinati } @JsonProperty("destination") - public IngressControllerSpecLADestination getDestination() { + public LoggingDestination getDestination() { return destination; } @JsonProperty("destination") - public void setDestination(IngressControllerSpecLADestination destination) { + public void setDestination(LoggingDestination destination) { this.destination = destination; } @JsonProperty("httpCaptureCookies") - public Object getHttpCaptureCookies() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getHttpCaptureCookies() { return httpCaptureCookies; } @JsonProperty("httpCaptureCookies") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setHttpCaptureCookies(Object httpCaptureCookies) { + public void setHttpCaptureCookies(List httpCaptureCookies) { this.httpCaptureCookies = httpCaptureCookies; } @JsonProperty("httpCaptureHeaders") - public IngressControllerSpecLAHttpCaptureHeaders getHttpCaptureHeaders() { + public IngressControllerCaptureHTTPHeaders getHttpCaptureHeaders() { return httpCaptureHeaders; } @JsonProperty("httpCaptureHeaders") - public void setHttpCaptureHeaders(IngressControllerSpecLAHttpCaptureHeaders httpCaptureHeaders) { + public void setHttpCaptureHeaders(IngressControllerCaptureHTTPHeaders httpCaptureHeaders) { this.httpCaptureHeaders = httpCaptureHeaders; } @@ -140,12 +142,12 @@ public void setLogEmptyRequests(String logEmptyRequests) { } @JsonIgnore - public IngressControllerSpecLAccessBuilder edit() { - return new IngressControllerSpecLAccessBuilder(this); + public AccessLoggingBuilder edit() { + return new AccessLoggingBuilder(this); } @JsonIgnore - public IngressControllerSpecLAccessBuilder toBuilder() { + public AccessLoggingBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCAddPage.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AddPage.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCAddPage.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AddPage.java index 274848e3d46..182aaad8cfb 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCAddPage.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AddPage.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCAddPage implements Editable , KubernetesResource +public class AddPage implements Editable , KubernetesResource { @JsonProperty("disabledActions") @@ -66,10 +66,10 @@ public class ConsoleSpecCAddPage implements Editable * No args constructor for use in serialization * */ - public ConsoleSpecCAddPage() { + public AddPage() { } - public ConsoleSpecCAddPage(List disabledActions) { + public AddPage(List disabledActions) { super(); this.disabledActions = disabledActions; } @@ -86,12 +86,12 @@ public void setDisabledActions(List disabledActions) { } @JsonIgnore - public ConsoleSpecCAddPageBuilder edit() { - return new ConsoleSpecCAddPageBuilder(this); + public AddPageBuilder edit() { + return new AddPageBuilder(this); } @JsonIgnore - public ConsoleSpecCAddPageBuilder toBuilder() { + public AddPageBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecAdditionalNetworks.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AdditionalNetworkDefinition.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecAdditionalNetworks.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AdditionalNetworkDefinition.java index f6dda41bf54..06377ad4e6e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecAdditionalNetworks.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AdditionalNetworkDefinition.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecAdditionalNetworks implements Editable , KubernetesResource +public class AdditionalNetworkDefinition implements Editable , KubernetesResource { @JsonProperty("name") @@ -65,7 +65,7 @@ public class NetworkSpecAdditionalNetworks implements Editable , KubernetesResource +{ + + @JsonProperty("providers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List providers = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AdditionalRoutingCapabilities() { + } + + public AdditionalRoutingCapabilities(List providers) { + super(); + this.providers = providers; + } + + @JsonProperty("providers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getProviders() { + return providers; + } + + @JsonProperty("providers") + public void setProviders(List providers) { + this.providers = providers; + } + + @JsonIgnore + public AdditionalRoutingCapabilitiesBuilder edit() { + return new AdditionalRoutingCapabilitiesBuilder(this); + } + + @JsonIgnore + public AdditionalRoutingCapabilitiesBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatus.java index d9bdcdb7864..388cd4e4365 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatus.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "oauthAPIServer", "observedGeneration", "readyReplicas", @@ -63,12 +64,14 @@ public class AuthenticationStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("oauthAPIServer") - private AuthenticationStatusOauthAPIServer oauthAPIServer; + private OAuthAPIServerStatus oauthAPIServer; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -85,10 +88,11 @@ public class AuthenticationStatus implements Editable conditions, List generations, AuthenticationStatusOauthAPIServer oauthAPIServer, Long observedGeneration, Integer readyReplicas, String version) { + public AuthenticationStatus(List conditions, List generations, Integer latestAvailableRevision, OAuthAPIServerStatus oauthAPIServer, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.oauthAPIServer = oauthAPIServer; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; @@ -97,33 +101,43 @@ public AuthenticationStatus(List conditions, Lis @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("oauthAPIServer") - public AuthenticationStatusOauthAPIServer getOauthAPIServer() { + public OAuthAPIServerStatus getOauthAPIServer() { return oauthAPIServer; } @JsonProperty("oauthAPIServer") - public void setOauthAPIServer(AuthenticationStatusOauthAPIServer oauthAPIServer) { + public void setOauthAPIServer(OAuthAPIServerStatus oauthAPIServer) { this.oauthAPIServer = oauthAPIServer; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusGenerations.java deleted file mode 100644 index f7940695b47..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class AuthenticationStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public AuthenticationStatusGenerations() { - } - - public AuthenticationStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public AuthenticationStatusGenerationsBuilder edit() { - return new AuthenticationStatusGenerationsBuilder(this); - } - - @JsonIgnore - public AuthenticationStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCAzure.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java similarity index 82% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCAzure.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java index 452c601e027..b42fdceac67 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCAzure.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterCSIDriverSpecDCAzure implements Editable , KubernetesResource +public class AzureCSIDriverConfigSpec implements Editable , KubernetesResource { @JsonProperty("diskEncryptionSet") - private ClusterCSIDriverSpecDCAzureDiskEncryptionSet diskEncryptionSet; + private AzureDiskEncryptionSet diskEncryptionSet; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ClusterCSIDriverSpecDCAzure implements Editable , KubernetesResource +public class AzureDiskEncryptionSet implements Editable , KubernetesResource { @JsonProperty("name") @@ -69,10 +69,10 @@ public class ClusterCSIDriverSpecDCAzureDiskEncryptionSet implements Editable , KubernetesResource +public class CSIDriverConfigSpec implements Editable , KubernetesResource { @JsonProperty("aws") - private ClusterCSIDriverSpecDCAws aws; + private AWSCSIDriverConfigSpec aws; @JsonProperty("azure") - private ClusterCSIDriverSpecDCAzure azure; + private AzureCSIDriverConfigSpec azure; @JsonProperty("driverType") private String driverType; @JsonProperty("gcp") - private ClusterCSIDriverSpecDCGcp gcp; + private GCPCSIDriverConfigSpec gcp; @JsonProperty("ibmcloud") - private ClusterCSIDriverSpecDCIbmcloud ibmcloud; + private IBMCloudCSIDriverConfigSpec ibmcloud; @JsonProperty("vSphere") - private ClusterCSIDriverSpecDCVSphere vSphere; + private VSphereCSIDriverConfigSpec vSphere; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -78,10 +78,10 @@ public class ClusterCSIDriverSpecDriverConfig implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class CSISnapshotControllerStatus implements Editable conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public CSISnapshotControllerStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public CSISnapshotControllerStatus(List c @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotControllerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotControllerStatusConditions.java deleted file mode 100644 index ee632affcc4..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotControllerStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class CSISnapshotControllerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public CSISnapshotControllerStatusConditions() { - } - - public CSISnapshotControllerStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public CSISnapshotControllerStatusConditionsBuilder edit() { - return new CSISnapshotControllerStatusConditionsBuilder(this); - } - - @JsonIgnore - public CSISnapshotControllerStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotControllerStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotControllerStatusGenerations.java deleted file mode 100644 index 237b19257eb..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotControllerStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class CSISnapshotControllerStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public CSISnapshotControllerStatusGenerations() { - } - - public CSISnapshotControllerStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public CSISnapshotControllerStatusGenerationsBuilder edit() { - return new CSISnapshotControllerStatusGenerationsBuilder(this); - } - - @JsonIgnore - public CSISnapshotControllerStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCCustomLogoFile.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Capability.java similarity index 82% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCCustomLogoFile.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Capability.java index c1567fb67b9..f5070161d5d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCCustomLogoFile.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Capability.java @@ -31,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "key", - "name" + "name", + "visibility" }) @ToString @EqualsAndHashCode @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCCustomLogoFile implements Editable , KubernetesResource +public class Capability implements Editable , KubernetesResource { - @JsonProperty("key") - private String key; @JsonProperty("name") private String name; + @JsonProperty("visibility") + private CapabilityVisibility visibility; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,23 +66,13 @@ public class ConsoleSpecCCustomLogoFile implements Editable , KubernetesResource +public class CapabilityVisibility implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("state") + private String state; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ConsoleSpecRSecret implements Editable , * No args constructor for use in serialization * */ - public ConsoleSpecRSecret() { + public CapabilityVisibility() { } - public ConsoleSpecRSecret(String name) { + public CapabilityVisibility(String state) { super(); - this.name = name; + this.state = state; } - @JsonProperty("name") - public String getName() { - return name; + @JsonProperty("state") + public String getState() { + return state; } - @JsonProperty("name") - public void setName(String name) { - this.name = name; + @JsonProperty("state") + public void setState(String state) { + this.state = state; } @JsonIgnore - public ConsoleSpecRSecretBuilder edit() { - return new ConsoleSpecRSecretBuilder(this); + public CapabilityVisibilityBuilder edit() { + return new CapabilityVisibilityBuilder(this); } @JsonIgnore - public ConsoleSpecRSecretBuilder toBuilder() { + public CapabilityVisibilityBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecClientTLS.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClientTLS.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecClientTLS.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClientTLS.java index f4e3708bf85..959cefeda7f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecClientTLS.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClientTLS.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -55,14 +56,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecClientTLS implements Editable , KubernetesResource +public class ClientTLS implements Editable , KubernetesResource { @JsonProperty("allowedSubjectPatterns") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List allowedSubjectPatterns = new ArrayList<>(); @JsonProperty("clientCA") - private IngressControllerSpecCTClientCA clientCA; + private ConfigMapNameReference clientCA; @JsonProperty("clientCertificatePolicy") private String clientCertificatePolicy; @JsonIgnore @@ -72,10 +73,10 @@ public class IngressControllerSpecClientTLS implements Editable allowedSubjectPatterns, IngressControllerSpecCTClientCA clientCA, String clientCertificatePolicy) { + public ClientTLS(List allowedSubjectPatterns, ConfigMapNameReference clientCA, String clientCertificatePolicy) { super(); this.allowedSubjectPatterns = allowedSubjectPatterns; this.clientCA = clientCA; @@ -94,12 +95,12 @@ public void setAllowedSubjectPatterns(List allowedSubjectPatterns) { } @JsonProperty("clientCA") - public IngressControllerSpecCTClientCA getClientCA() { + public ConfigMapNameReference getClientCA() { return clientCA; } @JsonProperty("clientCA") - public void setClientCA(IngressControllerSpecCTClientCA clientCA) { + public void setClientCA(ConfigMapNameReference clientCA) { this.clientCA = clientCA; } @@ -114,12 +115,12 @@ public void setClientCertificatePolicy(String clientCertificatePolicy) { } @JsonIgnore - public IngressControllerSpecClientTLSBuilder edit() { - return new IngressControllerSpecClientTLSBuilder(this); + public ClientTLSBuilder edit() { + return new ClientTLSBuilder(this); } @JsonIgnore - public IngressControllerSpecClientTLSBuilder toBuilder() { + public ClientTLSBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatus.java index fa81da3f507..5acf4b40bd7 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatus.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "observedGeneration", "readyReplicas", "version" @@ -62,10 +63,12 @@ public class CloudCredentialStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class CloudCredentialStatus implements Editable conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public CloudCredentialStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public CloudCredentialStatus(List conditions, L @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatusGenerations.java deleted file mode 100644 index 2c2a1314aaa..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class CloudCredentialStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public CloudCredentialStatusGenerations() { - } - - public CloudCredentialStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public CloudCredentialStatusGenerationsBuilder edit() { - return new CloudCredentialStatusGenerationsBuilder(this); - } - - @JsonIgnore - public CloudCredentialStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java index da71ee522f5..3a7d6f30d5d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java @@ -61,7 +61,7 @@ public class ClusterCSIDriverSpec implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class ClusterCSIDriverStatus implements Editable conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public ClusterCSIDriverStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public ClusterCSIDriverStatus(List conditions, @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverStatusGenerations.java deleted file mode 100644 index b36673c5064..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ClusterCSIDriverStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ClusterCSIDriverStatusGenerations() { - } - - public ClusterCSIDriverStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public ClusterCSIDriverStatusGenerationsBuilder edit() { - return new ClusterCSIDriverStatusGenerationsBuilder(this); - } - - @JsonIgnore - public ClusterCSIDriverStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecClusterNetwork.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterNetworkEntry.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecClusterNetwork.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterNetworkEntry.java index d0dbb1f81dc..24483b7b13c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecClusterNetwork.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterNetworkEntry.java @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecClusterNetwork implements Editable , KubernetesResource +public class ClusterNetworkEntry implements Editable , KubernetesResource { @JsonProperty("cidr") private String cidr; @JsonProperty("hostPrefix") - private Integer hostPrefix; + private Long hostPrefix; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,10 +66,10 @@ public class NetworkSpecClusterNetwork implements Editable , KubernetesR @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class ConfigStatus implements Editable , KubernetesR public ConfigStatus() { } - public ConfigStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public ConfigStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public ConfigStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConfigStatusConditions.java deleted file mode 100644 index 76878b13093..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConfigStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConfigStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConfigStatusConditions() { - } - - public ConfigStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public ConfigStatusConditionsBuilder edit() { - return new ConfigStatusConditionsBuilder(this); - } - - @JsonIgnore - public ConfigStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecRoute.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleConfigRoute.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecRoute.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleConfigRoute.java index 828c3ca1198..cd96ca595c1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecRoute.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleConfigRoute.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.SecretNameReference; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -52,13 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecRoute implements Editable , KubernetesResource +public class ConsoleConfigRoute implements Editable , KubernetesResource { @JsonProperty("hostname") private String hostname; @JsonProperty("secret") - private ConsoleSpecRSecret secret; + private SecretNameReference secret; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,10 +67,10 @@ public class ConsoleSpecRoute implements Editable , Kub * No args constructor for use in serialization * */ - public ConsoleSpecRoute() { + public ConsoleConfigRoute() { } - public ConsoleSpecRoute(String hostname, ConsoleSpecRSecret secret) { + public ConsoleConfigRoute(String hostname, SecretNameReference secret) { super(); this.hostname = hostname; this.secret = secret; @@ -86,22 +87,22 @@ public void setHostname(String hostname) { } @JsonProperty("secret") - public ConsoleSpecRSecret getSecret() { + public SecretNameReference getSecret() { return secret; } @JsonProperty("secret") - public void setSecret(ConsoleSpecRSecret secret) { + public void setSecret(SecretNameReference secret) { this.secret = secret; } @JsonIgnore - public ConsoleSpecRouteBuilder edit() { - return new ConsoleSpecRouteBuilder(this); + public ConsoleConfigRouteBuilder edit() { + return new ConsoleConfigRouteBuilder(this); } @JsonIgnore - public ConsoleSpecRouteBuilder toBuilder() { + public ConsoleConfigRouteBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCustomization.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java similarity index 72% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCustomization.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java index d5e500cdce9..ee61a752261 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCustomization.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.ConfigMapFileReference; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -35,6 +36,7 @@ @JsonPropertyOrder({ "addPage", "brand", + "capabilities", "customLogoFile", "customProductName", "developerCatalog", @@ -61,28 +63,31 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCustomization implements Editable , KubernetesResource +public class ConsoleCustomization implements Editable , KubernetesResource { @JsonProperty("addPage") - private ConsoleSpecCAddPage addPage; + private AddPage addPage; @JsonProperty("brand") private String brand; + @JsonProperty("capabilities") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List capabilities = new ArrayList<>(); @JsonProperty("customLogoFile") - private ConsoleSpecCCustomLogoFile customLogoFile; + private ConfigMapFileReference customLogoFile; @JsonProperty("customProductName") private String customProductName; @JsonProperty("developerCatalog") - private ConsoleSpecCDeveloperCatalog developerCatalog; + private DeveloperConsoleCatalogCustomization developerCatalog; @JsonProperty("documentationBaseURL") private String documentationBaseURL; @JsonProperty("perspectives") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List perspectives = new ArrayList<>(); + private List perspectives = new ArrayList<>(); @JsonProperty("projectAccess") - private ConsoleSpecCProjectAccess projectAccess; + private ProjectAccess projectAccess; @JsonProperty("quickStarts") - private ConsoleSpecCQuickStarts quickStarts; + private QuickStarts quickStarts; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -90,13 +95,14 @@ public class ConsoleSpecCustomization implements Editable perspectives, ConsoleSpecCProjectAccess projectAccess, ConsoleSpecCQuickStarts quickStarts) { + public ConsoleCustomization(AddPage addPage, String brand, List capabilities, ConfigMapFileReference customLogoFile, String customProductName, DeveloperConsoleCatalogCustomization developerCatalog, String documentationBaseURL, List perspectives, ProjectAccess projectAccess, QuickStarts quickStarts) { super(); this.addPage = addPage; this.brand = brand; + this.capabilities = capabilities; this.customLogoFile = customLogoFile; this.customProductName = customProductName; this.developerCatalog = developerCatalog; @@ -107,12 +113,12 @@ public ConsoleSpecCustomization(ConsoleSpecCAddPage addPage, String brand, Conso } @JsonProperty("addPage") - public ConsoleSpecCAddPage getAddPage() { + public AddPage getAddPage() { return addPage; } @JsonProperty("addPage") - public void setAddPage(ConsoleSpecCAddPage addPage) { + public void setAddPage(AddPage addPage) { this.addPage = addPage; } @@ -126,13 +132,24 @@ public void setBrand(String brand) { this.brand = brand; } + @JsonProperty("capabilities") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCapabilities() { + return capabilities; + } + + @JsonProperty("capabilities") + public void setCapabilities(List capabilities) { + this.capabilities = capabilities; + } + @JsonProperty("customLogoFile") - public ConsoleSpecCCustomLogoFile getCustomLogoFile() { + public ConfigMapFileReference getCustomLogoFile() { return customLogoFile; } @JsonProperty("customLogoFile") - public void setCustomLogoFile(ConsoleSpecCCustomLogoFile customLogoFile) { + public void setCustomLogoFile(ConfigMapFileReference customLogoFile) { this.customLogoFile = customLogoFile; } @@ -147,12 +164,12 @@ public void setCustomProductName(String customProductName) { } @JsonProperty("developerCatalog") - public ConsoleSpecCDeveloperCatalog getDeveloperCatalog() { + public DeveloperConsoleCatalogCustomization getDeveloperCatalog() { return developerCatalog; } @JsonProperty("developerCatalog") - public void setDeveloperCatalog(ConsoleSpecCDeveloperCatalog developerCatalog) { + public void setDeveloperCatalog(DeveloperConsoleCatalogCustomization developerCatalog) { this.developerCatalog = developerCatalog; } @@ -168,42 +185,42 @@ public void setDocumentationBaseURL(String documentationBaseURL) { @JsonProperty("perspectives") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPerspectives() { + public List getPerspectives() { return perspectives; } @JsonProperty("perspectives") - public void setPerspectives(List perspectives) { + public void setPerspectives(List perspectives) { this.perspectives = perspectives; } @JsonProperty("projectAccess") - public ConsoleSpecCProjectAccess getProjectAccess() { + public ProjectAccess getProjectAccess() { return projectAccess; } @JsonProperty("projectAccess") - public void setProjectAccess(ConsoleSpecCProjectAccess projectAccess) { + public void setProjectAccess(ProjectAccess projectAccess) { this.projectAccess = projectAccess; } @JsonProperty("quickStarts") - public ConsoleSpecCQuickStarts getQuickStarts() { + public QuickStarts getQuickStarts() { return quickStarts; } @JsonProperty("quickStarts") - public void setQuickStarts(ConsoleSpecCQuickStarts quickStarts) { + public void setQuickStarts(QuickStarts quickStarts) { this.quickStarts = quickStarts; } @JsonIgnore - public ConsoleSpecCustomizationBuilder edit() { - return new ConsoleSpecCustomizationBuilder(this); + public ConsoleCustomizationBuilder edit() { + return new ConsoleCustomizationBuilder(this); } @JsonIgnore - public ConsoleSpecCustomizationBuilder toBuilder() { + public ConsoleCustomizationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecProviders.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleProviders.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecProviders.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleProviders.java index 6e45d0ee68a..7309ab6ef0b 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecProviders.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleProviders.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecProviders implements Editable , KubernetesResource +public class ConsoleProviders implements Editable , KubernetesResource { @JsonProperty("statuspage") - private ConsoleSpecPStatuspage statuspage; + private StatuspageProvider statuspage; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ConsoleSpecProviders implements Editable , KubernetesRes { @JsonProperty("customization") - private ConsoleSpecCustomization customization; + private ConsoleCustomization customization; @JsonProperty("ingress") - private ConsoleSpecIngress ingress; + private Ingress ingress; @JsonProperty("logLevel") private String logLevel; @JsonProperty("managementState") @@ -82,9 +82,9 @@ public class ConsoleSpec implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private List plugins = new ArrayList<>(); @JsonProperty("providers") - private ConsoleSpecProviders providers; + private ConsoleProviders providers; @JsonProperty("route") - private ConsoleSpecRoute route; + private ConsoleConfigRoute route; @JsonProperty("unsupportedConfigOverrides") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) private Object unsupportedConfigOverrides; @@ -98,7 +98,7 @@ public class ConsoleSpec implements Editable , KubernetesRes public ConsoleSpec() { } - public ConsoleSpec(ConsoleSpecCustomization customization, ConsoleSpecIngress ingress, String logLevel, String managementState, Object observedConfig, String operatorLogLevel, List plugins, ConsoleSpecProviders providers, ConsoleSpecRoute route, Object unsupportedConfigOverrides) { + public ConsoleSpec(ConsoleCustomization customization, Ingress ingress, String logLevel, String managementState, Object observedConfig, String operatorLogLevel, List plugins, ConsoleProviders providers, ConsoleConfigRoute route, Object unsupportedConfigOverrides) { super(); this.customization = customization; this.ingress = ingress; @@ -113,22 +113,22 @@ public ConsoleSpec(ConsoleSpecCustomization customization, ConsoleSpecIngress in } @JsonProperty("customization") - public ConsoleSpecCustomization getCustomization() { + public ConsoleCustomization getCustomization() { return customization; } @JsonProperty("customization") - public void setCustomization(ConsoleSpecCustomization customization) { + public void setCustomization(ConsoleCustomization customization) { this.customization = customization; } @JsonProperty("ingress") - public ConsoleSpecIngress getIngress() { + public Ingress getIngress() { return ingress; } @JsonProperty("ingress") - public void setIngress(ConsoleSpecIngress ingress) { + public void setIngress(Ingress ingress) { this.ingress = ingress; } @@ -185,22 +185,22 @@ public void setPlugins(List plugins) { } @JsonProperty("providers") - public ConsoleSpecProviders getProviders() { + public ConsoleProviders getProviders() { return providers; } @JsonProperty("providers") - public void setProviders(ConsoleSpecProviders providers) { + public void setProviders(ConsoleProviders providers) { this.providers = providers; } @JsonProperty("route") - public ConsoleSpecRoute getRoute() { + public ConsoleConfigRoute getRoute() { return route; } @JsonProperty("route") - public void setRoute(ConsoleSpecRoute route) { + public void setRoute(ConsoleConfigRoute route) { this.route = route; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatus.java index 03350b0694d..14401f57fd2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatus.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "observedGeneration", "readyReplicas", "version" @@ -62,10 +63,12 @@ public class ConsoleStatus implements Editable , Kubernete @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class ConsoleStatus implements Editable , Kubernete public ConsoleStatus() { } - public ConsoleStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public ConsoleStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public ConsoleStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatusConditions.java deleted file mode 100644 index f50fddf392d..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConsoleStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConsoleStatusConditions() { - } - - public ConsoleStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public ConsoleStatusConditionsBuilder edit() { - return new ConsoleStatusConditionsBuilder(this); - } - - @JsonIgnore - public ConsoleStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatusGenerations.java deleted file mode 100644 index e88e99cb6b0..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ConsoleStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ConsoleStatusGenerations() { - } - - public ConsoleStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public ConsoleStatusGenerationsBuilder edit() { - return new ConsoleStatusGenerationsBuilder(this); - } - - @JsonIgnore - public ConsoleStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADContainer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java similarity index 87% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADContainer.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java index 53935ecc2a2..f223a135633 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADContainer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecLADContainer implements Editable , KubernetesResource +public class ContainerLoggingDestinationParameters implements Editable , KubernetesResource { @JsonProperty("maxLength") @@ -63,10 +63,10 @@ public class IngressControllerSpecLADContainer implements Editable , KubernetesResource +public class DNSCache implements Editable , KubernetesResource { @JsonProperty("negativeTTL") @@ -66,10 +66,10 @@ public class DNSSpecCache implements Editable , KubernetesR * No args constructor for use in serialization * */ - public DNSSpecCache() { + public DNSCache() { } - public DNSSpecCache(String negativeTTL, String positiveTTL) { + public DNSCache(String negativeTTL, String positiveTTL) { super(); this.negativeTTL = negativeTTL; this.positiveTTL = positiveTTL; @@ -96,12 +96,12 @@ public void setPositiveTTL(String positiveTTL) { } @JsonIgnore - public DNSSpecCacheBuilder edit() { - return new DNSSpecCacheBuilder(this); + public DNSCacheBuilder edit() { + return new DNSCacheBuilder(this); } @JsonIgnore - public DNSSpecCacheBuilder toBuilder() { + public DNSCacheBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecNodePlacement.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSNodePlacement.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecNodePlacement.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSNodePlacement.java index 3b706396873..ef691a47cdd 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecNodePlacement.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSNodePlacement.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.Toleration; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -54,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecNodePlacement implements Editable , KubernetesResource +public class DNSNodePlacement implements Editable , KubernetesResource { @JsonProperty("nodeSelector") @@ -62,7 +63,7 @@ public class DNSSpecNodePlacement implements Editable nodeSelector = new LinkedHashMap<>(); @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,10 +71,10 @@ public class DNSSpecNodePlacement implements Editable nodeSelector, List tolerations) { + public DNSNodePlacement(Map nodeSelector, List tolerations) { super(); this.nodeSelector = nodeSelector; this.tolerations = tolerations; @@ -92,22 +93,22 @@ public void setNodeSelector(Map nodeSelector) { @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } @JsonIgnore - public DNSSpecNodePlacementBuilder edit() { - return new DNSSpecNodePlacementBuilder(this); + public DNSNodePlacementBuilder edit() { + return new DNSNodePlacementBuilder(this); } @JsonIgnore - public DNSSpecNodePlacementBuilder toBuilder() { + public DNSNodePlacementBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTCTls.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTCTls.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java index 28ab42359dd..31955cbd77f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTCTls.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -52,11 +53,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecSFPTCTls implements Editable , KubernetesResource +public class DNSOverTLSConfig implements Editable , KubernetesResource { @JsonProperty("caBundle") - private DNSSpecSFPTCTCaBundle caBundle; + private ConfigMapNameReference caBundle; @JsonProperty("serverName") private String serverName; @JsonIgnore @@ -66,22 +67,22 @@ public class DNSSpecSFPTCTls implements Editable , Kuber * No args constructor for use in serialization * */ - public DNSSpecSFPTCTls() { + public DNSOverTLSConfig() { } - public DNSSpecSFPTCTls(DNSSpecSFPTCTCaBundle caBundle, String serverName) { + public DNSOverTLSConfig(ConfigMapNameReference caBundle, String serverName) { super(); this.caBundle = caBundle; this.serverName = serverName; } @JsonProperty("caBundle") - public DNSSpecSFPTCTCaBundle getCaBundle() { + public ConfigMapNameReference getCaBundle() { return caBundle; } @JsonProperty("caBundle") - public void setCaBundle(DNSSpecSFPTCTCaBundle caBundle) { + public void setCaBundle(ConfigMapNameReference caBundle) { this.caBundle = caBundle; } @@ -96,12 +97,12 @@ public void setServerName(String serverName) { } @JsonIgnore - public DNSSpecSFPTCTlsBuilder edit() { - return new DNSSpecSFPTCTlsBuilder(this); + public DNSOverTLSConfigBuilder edit() { + return new DNSOverTLSConfigBuilder(this); } @JsonIgnore - public DNSSpecSFPTCTlsBuilder toBuilder() { + public DNSOverTLSConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java index c668fd7a42a..884bec05fb3 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java @@ -63,20 +63,20 @@ public class DNSSpec implements Editable , KubernetesResource { @JsonProperty("cache") - private DNSSpecCache cache; + private DNSCache cache; @JsonProperty("logLevel") private String logLevel; @JsonProperty("managementState") private String managementState; @JsonProperty("nodePlacement") - private DNSSpecNodePlacement nodePlacement; + private DNSNodePlacement nodePlacement; @JsonProperty("operatorLogLevel") private String operatorLogLevel; @JsonProperty("servers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List servers = new ArrayList<>(); + private List servers = new ArrayList<>(); @JsonProperty("upstreamResolvers") - private DNSSpecUpstreamResolvers upstreamResolvers; + private UpstreamResolvers upstreamResolvers; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -87,7 +87,7 @@ public class DNSSpec implements Editable , KubernetesResource public DNSSpec() { } - public DNSSpec(DNSSpecCache cache, String logLevel, String managementState, DNSSpecNodePlacement nodePlacement, String operatorLogLevel, List servers, DNSSpecUpstreamResolvers upstreamResolvers) { + public DNSSpec(DNSCache cache, String logLevel, String managementState, DNSNodePlacement nodePlacement, String operatorLogLevel, List servers, UpstreamResolvers upstreamResolvers) { super(); this.cache = cache; this.logLevel = logLevel; @@ -99,12 +99,12 @@ public DNSSpec(DNSSpecCache cache, String logLevel, String managementState, DNSS } @JsonProperty("cache") - public DNSSpecCache getCache() { + public DNSCache getCache() { return cache; } @JsonProperty("cache") - public void setCache(DNSSpecCache cache) { + public void setCache(DNSCache cache) { this.cache = cache; } @@ -129,12 +129,12 @@ public void setManagementState(String managementState) { } @JsonProperty("nodePlacement") - public DNSSpecNodePlacement getNodePlacement() { + public DNSNodePlacement getNodePlacement() { return nodePlacement; } @JsonProperty("nodePlacement") - public void setNodePlacement(DNSSpecNodePlacement nodePlacement) { + public void setNodePlacement(DNSNodePlacement nodePlacement) { this.nodePlacement = nodePlacement; } @@ -150,22 +150,22 @@ public void setOperatorLogLevel(String operatorLogLevel) { @JsonProperty("servers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServers() { + public List getServers() { return servers; } @JsonProperty("servers") - public void setServers(List servers) { + public void setServers(List servers) { this.servers = servers; } @JsonProperty("upstreamResolvers") - public DNSSpecUpstreamResolvers getUpstreamResolvers() { + public UpstreamResolvers getUpstreamResolvers() { return upstreamResolvers; } @JsonProperty("upstreamResolvers") - public void setUpstreamResolvers(DNSSpecUpstreamResolvers upstreamResolvers) { + public void setUpstreamResolvers(UpstreamResolvers upstreamResolvers) { this.upstreamResolvers = upstreamResolvers; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecNPTolerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecNPTolerations.java deleted file mode 100644 index 319b8021ef0..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecNPTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class DNSSpecNPTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public DNSSpecNPTolerations() { - } - - public DNSSpecNPTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public DNSSpecNPTolerationsBuilder edit() { - return new DNSSpecNPTolerationsBuilder(this); - } - - @JsonIgnore - public DNSSpecNPTolerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTransportConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTransportConfig.java deleted file mode 100644 index 6278ccf8368..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTransportConfig.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "tls", - "transport" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class DNSSpecURTransportConfig implements Editable , KubernetesResource -{ - - @JsonProperty("tls") - private DNSSpecURTCTls tls; - @JsonProperty("transport") - private String transport; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public DNSSpecURTransportConfig() { - } - - public DNSSpecURTransportConfig(DNSSpecURTCTls tls, String transport) { - super(); - this.tls = tls; - this.transport = transport; - } - - @JsonProperty("tls") - public DNSSpecURTCTls getTls() { - return tls; - } - - @JsonProperty("tls") - public void setTls(DNSSpecURTCTls tls) { - this.tls = tls; - } - - @JsonProperty("transport") - public String getTransport() { - return transport; - } - - @JsonProperty("transport") - public void setTransport(String transport) { - this.transport = transport; - } - - @JsonIgnore - public DNSSpecURTransportConfigBuilder edit() { - return new DNSSpecURTransportConfigBuilder(this); - } - - @JsonIgnore - public DNSSpecURTransportConfigBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSStatus.java index db49039165b..1a1892d9964 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSStatus.java @@ -64,7 +64,7 @@ public class DNSStatus implements Editable , KubernetesResourc private String clusterIP; @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,7 +75,7 @@ public class DNSStatus implements Editable , KubernetesResourc public DNSStatus() { } - public DNSStatus(String clusterDomain, String clusterIP, List conditions) { + public DNSStatus(String clusterDomain, String clusterIP, List conditions) { super(); this.clusterDomain = clusterDomain; this.clusterIP = clusterIP; @@ -104,12 +104,12 @@ public void setClusterIP(String clusterIP) { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTransportConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java similarity index 87% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTransportConfig.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java index e40a1d50a40..1434fbd8697 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTransportConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecSFPTransportConfig implements Editable , KubernetesResource +public class DNSTransportConfig implements Editable , KubernetesResource { @JsonProperty("tls") - private DNSSpecSFPTCTls tls; + private DNSOverTLSConfig tls; @JsonProperty("transport") private String transport; @JsonIgnore @@ -66,22 +66,22 @@ public class DNSSpecSFPTransportConfig implements Editable , KubernetesResource +public class DefaultNetworkDefinition implements Editable , KubernetesResource { @JsonProperty("openshiftSDNConfig") - private NetworkSpecDNOpenshiftSDNConfig openshiftSDNConfig; + private OpenShiftSDNConfig openshiftSDNConfig; @JsonProperty("ovnKubernetesConfig") - private NetworkSpecDNOvnKubernetesConfig ovnKubernetesConfig; + private OVNKubernetesConfig ovnKubernetesConfig; @JsonProperty("type") private String type; @JsonIgnore @@ -69,10 +69,10 @@ public class NetworkSpecDefaultNetwork implements Editable , KubernetesResource +public class DeveloperConsoleCatalogCategory implements Editable , KubernetesResource { @JsonProperty("id") @@ -65,7 +65,7 @@ public class ConsoleSpecCDCCategories implements Editable subcategories = new ArrayList<>(); + private List subcategories = new ArrayList<>(); @JsonProperty("tags") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List tags = new ArrayList<>(); @@ -76,10 +76,10 @@ public class ConsoleSpecCDCCategories implements Editable subcategories, List tags) { + public DeveloperConsoleCatalogCategory(String id, String label, List subcategories, List tags) { super(); this.id = id; this.label = label; @@ -109,12 +109,12 @@ public void setLabel(String label) { @JsonProperty("subcategories") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSubcategories() { + public List getSubcategories() { return subcategories; } @JsonProperty("subcategories") - public void setSubcategories(List subcategories) { + public void setSubcategories(List subcategories) { this.subcategories = subcategories; } @@ -130,12 +130,12 @@ public void setTags(List tags) { } @JsonIgnore - public ConsoleSpecCDCCategoriesBuilder edit() { - return new ConsoleSpecCDCCategoriesBuilder(this); + public DeveloperConsoleCatalogCategoryBuilder edit() { + return new DeveloperConsoleCatalogCategoryBuilder(this); } @JsonIgnore - public ConsoleSpecCDCCategoriesBuilder toBuilder() { + public DeveloperConsoleCatalogCategoryBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDCCSubcategories.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCategoryMeta.java similarity index 89% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDCCSubcategories.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCategoryMeta.java index 562f4f94ac5..0c973c93fa0 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDCCSubcategories.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCategoryMeta.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCDCCSubcategories implements Editable , KubernetesResource +public class DeveloperConsoleCatalogCategoryMeta implements Editable , KubernetesResource { @JsonProperty("id") @@ -72,10 +72,10 @@ public class ConsoleSpecCDCCSubcategories implements Editable tags) { + public DeveloperConsoleCatalogCategoryMeta(String id, String label, List tags) { super(); this.id = id; this.label = label; @@ -114,12 +114,12 @@ public void setTags(List tags) { } @JsonIgnore - public ConsoleSpecCDCCSubcategoriesBuilder edit() { - return new ConsoleSpecCDCCSubcategoriesBuilder(this); + public DeveloperConsoleCatalogCategoryMetaBuilder edit() { + return new DeveloperConsoleCatalogCategoryMetaBuilder(this); } @JsonIgnore - public ConsoleSpecCDCCSubcategoriesBuilder toBuilder() { + public DeveloperConsoleCatalogCategoryMetaBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDeveloperCatalog.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java similarity index 79% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDeveloperCatalog.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java index 27f6e047c44..7e6db2bb9ff 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDeveloperCatalog.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java @@ -54,14 +54,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCDeveloperCatalog implements Editable , KubernetesResource +public class DeveloperConsoleCatalogCustomization implements Editable , KubernetesResource { @JsonProperty("categories") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List categories = new ArrayList<>(); + private List categories = new ArrayList<>(); @JsonProperty("types") - private ConsoleSpecCDCTypes types; + private DeveloperConsoleCatalogTypes types; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class ConsoleSpecCDeveloperCatalog implements Editable categories, ConsoleSpecCDCTypes types) { + public DeveloperConsoleCatalogCustomization(List categories, DeveloperConsoleCatalogTypes types) { super(); this.categories = categories; this.types = types; @@ -80,32 +80,32 @@ public ConsoleSpecCDeveloperCatalog(List categories, C @JsonProperty("categories") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getCategories() { + public List getCategories() { return categories; } @JsonProperty("categories") - public void setCategories(List categories) { + public void setCategories(List categories) { this.categories = categories; } @JsonProperty("types") - public ConsoleSpecCDCTypes getTypes() { + public DeveloperConsoleCatalogTypes getTypes() { return types; } @JsonProperty("types") - public void setTypes(ConsoleSpecCDCTypes types) { + public void setTypes(DeveloperConsoleCatalogTypes types) { this.types = types; } @JsonIgnore - public ConsoleSpecCDeveloperCatalogBuilder edit() { - return new ConsoleSpecCDeveloperCatalogBuilder(this); + public DeveloperConsoleCatalogCustomizationBuilder edit() { + return new DeveloperConsoleCatalogCustomizationBuilder(this); } @JsonIgnore - public ConsoleSpecCDeveloperCatalogBuilder toBuilder() { + public DeveloperConsoleCatalogCustomizationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDCTypes.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDCTypes.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java index add98ed8ca6..74a954d29e5 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCDCTypes.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCDCTypes implements Editable , KubernetesResource +public class DeveloperConsoleCatalogTypes implements Editable , KubernetesResource { @JsonProperty("disabled") @@ -73,10 +73,10 @@ public class ConsoleSpecCDCTypes implements Editable * No args constructor for use in serialization * */ - public ConsoleSpecCDCTypes() { + public DeveloperConsoleCatalogTypes() { } - public ConsoleSpecCDCTypes(List disabled, List enabled, String state) { + public DeveloperConsoleCatalogTypes(List disabled, List enabled, String state) { super(); this.disabled = disabled; this.enabled = enabled; @@ -116,12 +116,12 @@ public void setState(String state) { } @JsonIgnore - public ConsoleSpecCDCTypesBuilder edit() { - return new ConsoleSpecCDCTypesBuilder(this); + public DeveloperConsoleCatalogTypesBuilder edit() { + return new DeveloperConsoleCatalogTypesBuilder(this); } @JsonIgnore - public ConsoleSpecCDCTypesBuilder toBuilder() { + public DeveloperConsoleCatalogTypesBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCEgressIPConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java similarity index 83% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCEgressIPConfig.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java index 42885316370..aac98c6a68e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCEgressIPConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecDNOKCEgressIPConfig implements Editable , KubernetesResource +public class EgressIPConfig implements Editable , KubernetesResource { @JsonProperty("reachabilityTotalTimeoutSeconds") - private Integer reachabilityTotalTimeoutSeconds; + private Long reachabilityTotalTimeoutSeconds; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class NetworkSpecDNOKCEgressIPConfig implements Editable , KubernetesResource +public class EndpointPublishingStrategy implements Editable , KubernetesResource { @JsonProperty("hostNetwork") - private IngressControllerSpecEPSHostNetwork hostNetwork; + private HostNetworkStrategy hostNetwork; @JsonProperty("loadBalancer") - private IngressControllerSpecEPSLoadBalancer loadBalancer; + private LoadBalancerStrategy loadBalancer; @JsonProperty("nodePort") - private IngressControllerSpecEPSNodePort nodePort; + private NodePortStrategy nodePort; @JsonProperty("private") - private IngressControllerSpecEPSPrivate _private; + private PrivateStrategy _private; @JsonProperty("type") private String type; @JsonIgnore @@ -75,10 +75,10 @@ public class IngressControllerSpecEndpointPublishingStrategy implements Editable * No args constructor for use in serialization * */ - public IngressControllerSpecEndpointPublishingStrategy() { + public EndpointPublishingStrategy() { } - public IngressControllerSpecEndpointPublishingStrategy(IngressControllerSpecEPSHostNetwork hostNetwork, IngressControllerSpecEPSLoadBalancer loadBalancer, IngressControllerSpecEPSNodePort nodePort, IngressControllerSpecEPSPrivate _private, String type) { + public EndpointPublishingStrategy(HostNetworkStrategy hostNetwork, LoadBalancerStrategy loadBalancer, NodePortStrategy nodePort, PrivateStrategy _private, String type) { super(); this.hostNetwork = hostNetwork; this.loadBalancer = loadBalancer; @@ -88,42 +88,42 @@ public IngressControllerSpecEndpointPublishingStrategy(IngressControllerSpecEPSH } @JsonProperty("hostNetwork") - public IngressControllerSpecEPSHostNetwork getHostNetwork() { + public HostNetworkStrategy getHostNetwork() { return hostNetwork; } @JsonProperty("hostNetwork") - public void setHostNetwork(IngressControllerSpecEPSHostNetwork hostNetwork) { + public void setHostNetwork(HostNetworkStrategy hostNetwork) { this.hostNetwork = hostNetwork; } @JsonProperty("loadBalancer") - public IngressControllerSpecEPSLoadBalancer getLoadBalancer() { + public LoadBalancerStrategy getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(IngressControllerSpecEPSLoadBalancer loadBalancer) { + public void setLoadBalancer(LoadBalancerStrategy loadBalancer) { this.loadBalancer = loadBalancer; } @JsonProperty("nodePort") - public IngressControllerSpecEPSNodePort getNodePort() { + public NodePortStrategy getNodePort() { return nodePort; } @JsonProperty("nodePort") - public void setNodePort(IngressControllerSpecEPSNodePort nodePort) { + public void setNodePort(NodePortStrategy nodePort) { this.nodePort = nodePort; } @JsonProperty("private") - public IngressControllerSpecEPSPrivate getPrivate() { + public PrivateStrategy getPrivate() { return _private; } @JsonProperty("private") - public void setPrivate(IngressControllerSpecEPSPrivate _private) { + public void setPrivate(PrivateStrategy _private) { this._private = _private; } @@ -138,12 +138,12 @@ public void setType(String type) { } @JsonIgnore - public IngressControllerSpecEndpointPublishingStrategyBuilder edit() { - return new IngressControllerSpecEndpointPublishingStrategyBuilder(this); + public EndpointPublishingStrategyBuilder edit() { + return new EndpointPublishingStrategyBuilder(this); } @JsonIgnore - public IngressControllerSpecEndpointPublishingStrategyBuilder toBuilder() { + public EndpointPublishingStrategyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdSpec.java index a943e44b54a..3eef8f68211 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdSpec.java @@ -31,6 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ + "backendQuotaGiB", "controlPlaneHardwareSpeed", "failedRevisionLimit", "forceRedeploymentReason", @@ -62,6 +63,8 @@ public class EtcdSpec implements Editable , KubernetesResource { + @JsonProperty("backendQuotaGiB") + private Integer backendQuotaGiB; @JsonProperty("controlPlaneHardwareSpeed") private String controlPlaneHardwareSpeed; @JsonProperty("failedRevisionLimit") @@ -92,8 +95,9 @@ public class EtcdSpec implements Editable , KubernetesResource public EtcdSpec() { } - public EtcdSpec(String controlPlaneHardwareSpeed, Integer failedRevisionLimit, String forceRedeploymentReason, String logLevel, String managementState, Object observedConfig, String operatorLogLevel, Integer succeededRevisionLimit, Object unsupportedConfigOverrides) { + public EtcdSpec(Integer backendQuotaGiB, String controlPlaneHardwareSpeed, Integer failedRevisionLimit, String forceRedeploymentReason, String logLevel, String managementState, Object observedConfig, String operatorLogLevel, Integer succeededRevisionLimit, Object unsupportedConfigOverrides) { super(); + this.backendQuotaGiB = backendQuotaGiB; this.controlPlaneHardwareSpeed = controlPlaneHardwareSpeed; this.failedRevisionLimit = failedRevisionLimit; this.forceRedeploymentReason = forceRedeploymentReason; @@ -105,6 +109,16 @@ public EtcdSpec(String controlPlaneHardwareSpeed, Integer failedRevisionLimit, S this.unsupportedConfigOverrides = unsupportedConfigOverrides; } + @JsonProperty("backendQuotaGiB") + public Integer getBackendQuotaGiB() { + return backendQuotaGiB; + } + + @JsonProperty("backendQuotaGiB") + public void setBackendQuotaGiB(Integer backendQuotaGiB) { + this.backendQuotaGiB = backendQuotaGiB; + } + @JsonProperty("controlPlaneHardwareSpeed") public String getControlPlaneHardwareSpeed() { return controlPlaneHardwareSpeed; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatus.java index 04b607dca44..4f92fd86b01 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatus.java @@ -66,19 +66,19 @@ public class EtcdStatus implements Editable , KubernetesResou @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("controlPlaneHardwareSpeed") private String controlPlaneHardwareSpeed; @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("latestAvailableRevision") private Integer latestAvailableRevision; @JsonProperty("latestAvailableRevisionReason") private String latestAvailableRevisionReason; @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nodeStatuses = new ArrayList<>(); + private List nodeStatuses = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -95,7 +95,7 @@ public class EtcdStatus implements Editable , KubernetesResou public EtcdStatus() { } - public EtcdStatus(List conditions, String controlPlaneHardwareSpeed, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { + public EtcdStatus(List conditions, String controlPlaneHardwareSpeed, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.controlPlaneHardwareSpeed = controlPlaneHardwareSpeed; @@ -110,12 +110,12 @@ public EtcdStatus(List conditions, String controlPlaneHard @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @@ -131,12 +131,12 @@ public void setControlPlaneHardwareSpeed(String controlPlaneHardwareSpeed) { @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } @@ -162,12 +162,12 @@ public void setLatestAvailableRevisionReason(String latestAvailableRevisionReaso @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNodeStatuses() { + public List getNodeStatuses() { return nodeStatuses; } @JsonProperty("nodeStatuses") - public void setNodeStatuses(List nodeStatuses) { + public void setNodeStatuses(List nodeStatuses) { this.nodeStatuses = nodeStatuses; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecExportNetworkFlows.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ExportNetworkFlows.java similarity index 79% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecExportNetworkFlows.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ExportNetworkFlows.java index 4898a681731..661efb139a2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecExportNetworkFlows.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ExportNetworkFlows.java @@ -53,15 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecExportNetworkFlows implements Editable , KubernetesResource +public class ExportNetworkFlows implements Editable , KubernetesResource { @JsonProperty("ipfix") - private NetworkSpecENFIpfix ipfix; + private IPFIXConfig ipfix; @JsonProperty("netFlow") - private NetworkSpecENFNetFlow netFlow; + private NetFlowConfig netFlow; @JsonProperty("sFlow") - private NetworkSpecENFSFlow sFlow; + private SFlowConfig sFlow; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class NetworkSpecExportNetworkFlows implements Editable , KubernetesResource +public class FeaturesMigration implements Editable , KubernetesResource { @JsonProperty("egressFirewall") @@ -69,10 +69,10 @@ public class NetworkSpecMFeatures implements Editable , KubernetesResource +public class ForwardPlugin implements Editable , KubernetesResource { @JsonProperty("policy") @@ -64,7 +64,7 @@ public class DNSSpecSForwardPlugin implements Editable upstreams = new ArrayList<>(); @@ -75,10 +75,10 @@ public class DNSSpecSForwardPlugin implements Editable upstreams) { + public ForwardPlugin(String policy, String protocolStrategy, DNSTransportConfig transportConfig, List upstreams) { super(); this.policy = policy; this.protocolStrategy = protocolStrategy; @@ -107,12 +107,12 @@ public void setProtocolStrategy(String protocolStrategy) { } @JsonProperty("transportConfig") - public DNSSpecSFPTransportConfig getTransportConfig() { + public DNSTransportConfig getTransportConfig() { return transportConfig; } @JsonProperty("transportConfig") - public void setTransportConfig(DNSSpecSFPTransportConfig transportConfig) { + public void setTransportConfig(DNSTransportConfig transportConfig) { this.transportConfig = transportConfig; } @@ -128,12 +128,12 @@ public void setUpstreams(List upstreams) { } @JsonIgnore - public DNSSpecSForwardPluginBuilder edit() { - return new DNSSpecSForwardPluginBuilder(this); + public ForwardPluginBuilder edit() { + return new ForwardPluginBuilder(this); } @JsonIgnore - public DNSSpecSForwardPluginBuilder toBuilder() { + public ForwardPluginBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCGcp.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java similarity index 84% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCGcp.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java index 39946791a7c..6c5eac496da 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCGcp.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterCSIDriverSpecDCGcp implements Editable , KubernetesResource +public class GCPCSIDriverConfigSpec implements Editable , KubernetesResource { @JsonProperty("kmsKey") - private ClusterCSIDriverSpecDCGcpKmsKey kmsKey; + private GCPKMSKeyReference kmsKey; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ClusterCSIDriverSpecDCGcp implements Editable , KubernetesResource +public class GCPKMSKeyReference implements Editable , KubernetesResource { @JsonProperty("keyRing") @@ -72,10 +72,10 @@ public class ClusterCSIDriverSpecDCGcpKmsKey implements Editable , KubernetesResource +public class GCPLoadBalancerParameters implements Editable , KubernetesResource { @JsonProperty("clientAccess") @@ -63,10 +63,10 @@ public class IngressControllerSpecEPSLBPPGcp implements Editable , KubernetesResource +public class GatewayConfig implements Editable , KubernetesResource { @JsonProperty("ipForwarding") private String ipForwarding; @JsonProperty("ipv4") - private NetworkSpecDNOKCGCIpv4 ipv4; + private IPv4GatewayConfig ipv4; @JsonProperty("ipv6") - private NetworkSpecDNOKCGCIpv6 ipv6; + private IPv6GatewayConfig ipv6; @JsonProperty("routingViaHost") private Boolean routingViaHost; @JsonIgnore @@ -72,10 +72,10 @@ public class NetworkSpecDNOKCGatewayConfig implements Editable , KubernetesResource +public class GatherStatus implements Editable , KubernetesResource { @JsonProperty("gatherers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List gatherers = new ArrayList<>(); + private List gatherers = new ArrayList<>(); @JsonProperty("lastGatherDuration") private String lastGatherDuration; @JsonProperty("lastGatherTime") @@ -72,10 +72,10 @@ public class InsightsOperatorStatusGatherStatus implements Editable gatherers, String lastGatherDuration, String lastGatherTime) { + public GatherStatus(List gatherers, String lastGatherDuration, String lastGatherTime) { super(); this.gatherers = gatherers; this.lastGatherDuration = lastGatherDuration; @@ -84,12 +84,12 @@ public InsightsOperatorStatusGatherStatus(List getGatherers() { + public List getGatherers() { return gatherers; } @JsonProperty("gatherers") - public void setGatherers(List gatherers) { + public void setGatherers(List gatherers) { this.gatherers = gatherers; } @@ -114,12 +114,12 @@ public void setLastGatherTime(String lastGatherTime) { } @JsonIgnore - public InsightsOperatorStatusGatherStatusBuilder edit() { - return new InsightsOperatorStatusGatherStatusBuilder(this); + public GatherStatusBuilder edit() { + return new GatherStatusBuilder(this); } @JsonIgnore - public InsightsOperatorStatusGatherStatusBuilder toBuilder() { + public GatherStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusGSGatherers.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GathererStatus.java similarity index 84% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusGSGatherers.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GathererStatus.java index 73468fc835a..33731a9aab4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusGSGatherers.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GathererStatus.java @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -55,12 +56,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InsightsOperatorStatusGSGatherers implements Editable , KubernetesResource +public class GathererStatus implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("lastGatherDuration") private String lastGatherDuration; @JsonProperty("name") @@ -72,10 +73,10 @@ public class InsightsOperatorStatusGSGatherers implements Editable conditions, String lastGatherDuration, String name) { + public GathererStatus(List conditions, String lastGatherDuration, String name) { super(); this.conditions = conditions; this.lastGatherDuration = lastGatherDuration; @@ -84,12 +85,12 @@ public InsightsOperatorStatusGSGatherers(List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @@ -114,12 +115,12 @@ public void setName(String name) { } @JsonIgnore - public InsightsOperatorStatusGSGatherersBuilder edit() { - return new InsightsOperatorStatusGSGatherersBuilder(this); + public GathererStatusBuilder edit() { + return new GathererStatusBuilder(this); } @JsonIgnore - public InsightsOperatorStatusGSGatherersBuilder toBuilder() { + public GathererStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GenerationStatus.java similarity index 91% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatusGenerations.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GenerationStatus.java index 26e1eb855ad..72e273426a0 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatusGenerations.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GenerationStatus.java @@ -56,7 +56,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EtcdStatusGenerations implements Editable , KubernetesResource +public class GenerationStatus implements Editable , KubernetesResource { @JsonProperty("group") @@ -78,10 +78,10 @@ public class EtcdStatusGenerations implements Editable , KubernetesResource +public class HTTPCompressionPolicy implements Editable , KubernetesResource { @JsonProperty("mimeTypes") @@ -66,10 +66,10 @@ public class IngressControllerSpecHttpCompression implements Editable mimeTypes) { + public HTTPCompressionPolicy(List mimeTypes) { super(); this.mimeTypes = mimeTypes; } @@ -86,12 +86,12 @@ public void setMimeTypes(List mimeTypes) { } @JsonIgnore - public IngressControllerSpecHttpCompressionBuilder edit() { - return new IngressControllerSpecHttpCompressionBuilder(this); + public HTTPCompressionPolicyBuilder edit() { + return new HTTPCompressionPolicyBuilder(this); } @JsonIgnore - public IngressControllerSpecHttpCompressionBuilder toBuilder() { + public HTTPCompressionPolicyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusIRHealthChecks.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HealthCheck.java similarity index 89% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusIRHealthChecks.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HealthCheck.java index 4e112e958d2..bc3484d4d1d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusIRHealthChecks.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HealthCheck.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InsightsOperatorStatusIRHealthChecks implements Editable , KubernetesResource +public class HealthCheck implements Editable , KubernetesResource { @JsonProperty("advisorURI") @@ -72,10 +72,10 @@ public class InsightsOperatorStatusIRHealthChecks implements Editable , KubernetesResource +public class HostNetworkStrategy implements Editable , KubernetesResource { @JsonProperty("httpPort") @@ -72,10 +72,10 @@ public class IngressControllerSpecEPSHostNetwork implements Editable , KubernetesResource +public class HybridOverlayConfig implements Editable , KubernetesResource { @JsonProperty("hybridClusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List hybridClusterNetwork = new ArrayList<>(); + private List hybridClusterNetwork = new ArrayList<>(); @JsonProperty("hybridOverlayVXLANPort") - private Integer hybridOverlayVXLANPort; + private Long hybridOverlayVXLANPort; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class NetworkSpecDNOKCHybridOverlayConfig implements Editable hybridClusterNetwork, Integer hybridOverlayVXLANPort) { + public HybridOverlayConfig(List hybridClusterNetwork, Long hybridOverlayVXLANPort) { super(); this.hybridClusterNetwork = hybridClusterNetwork; this.hybridOverlayVXLANPort = hybridOverlayVXLANPort; @@ -80,32 +80,32 @@ public NetworkSpecDNOKCHybridOverlayConfig(List getHybridClusterNetwork() { + public List getHybridClusterNetwork() { return hybridClusterNetwork; } @JsonProperty("hybridClusterNetwork") - public void setHybridClusterNetwork(List hybridClusterNetwork) { + public void setHybridClusterNetwork(List hybridClusterNetwork) { this.hybridClusterNetwork = hybridClusterNetwork; } @JsonProperty("hybridOverlayVXLANPort") - public Integer getHybridOverlayVXLANPort() { + public Long getHybridOverlayVXLANPort() { return hybridOverlayVXLANPort; } @JsonProperty("hybridOverlayVXLANPort") - public void setHybridOverlayVXLANPort(Integer hybridOverlayVXLANPort) { + public void setHybridOverlayVXLANPort(Long hybridOverlayVXLANPort) { this.hybridOverlayVXLANPort = hybridOverlayVXLANPort; } @JsonIgnore - public NetworkSpecDNOKCHybridOverlayConfigBuilder edit() { - return new NetworkSpecDNOKCHybridOverlayConfigBuilder(this); + public HybridOverlayConfigBuilder edit() { + return new HybridOverlayConfigBuilder(this); } @JsonIgnore - public NetworkSpecDNOKCHybridOverlayConfigBuilder toBuilder() { + public HybridOverlayConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCIbmcloud.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMCloudCSIDriverConfigSpec.java similarity index 88% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCIbmcloud.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMCloudCSIDriverConfigSpec.java index e2eae57652b..dd7590f4531 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCIbmcloud.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMCloudCSIDriverConfigSpec.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterCSIDriverSpecDCIbmcloud implements Editable , KubernetesResource +public class IBMCloudCSIDriverConfigSpec implements Editable , KubernetesResource { @JsonProperty("encryptionKeyCRN") @@ -63,10 +63,10 @@ public class ClusterCSIDriverSpecDCIbmcloud implements Editable , KubernetesResource +public class IBMLoadBalancerParameters implements Editable , KubernetesResource { @JsonProperty("protocol") @@ -63,10 +63,10 @@ public class IngressControllerSpecEPSLBPPIbm implements Editable , KubernetesResource +public class IPAMConfig implements Editable , KubernetesResource { @JsonProperty("staticIPAMConfig") - private NetworkSpecANSMCICStaticIPAMConfig staticIPAMConfig; + private StaticIPAMConfig staticIPAMConfig; @JsonProperty("type") private String type; @JsonIgnore @@ -66,22 +66,22 @@ public class NetworkSpecANSMCIpamConfig implements Editable , KubernetesResource +public class IPFIXConfig implements Editable , KubernetesResource { @JsonProperty("collectors") @@ -66,10 +66,10 @@ public class NetworkSpecENFIpfix implements Editable * No args constructor for use in serialization * */ - public NetworkSpecENFIpfix() { + public IPFIXConfig() { } - public NetworkSpecENFIpfix(List collectors) { + public IPFIXConfig(List collectors) { super(); this.collectors = collectors; } @@ -86,12 +86,12 @@ public void setCollectors(List collectors) { } @JsonIgnore - public NetworkSpecENFIpfixBuilder edit() { - return new NetworkSpecENFIpfixBuilder(this); + public IPFIXConfigBuilder edit() { + return new IPFIXConfigBuilder(this); } @JsonIgnore - public NetworkSpecENFIpfixBuilder toBuilder() { + public IPFIXConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCIpsecConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IPsecConfig.java similarity index 89% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCIpsecConfig.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IPsecConfig.java index 7be9290070c..e429e506d3b 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCIpsecConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IPsecConfig.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecDNOKCIpsecConfig implements Editable , KubernetesResource +public class IPsecConfig implements Editable , KubernetesResource { @JsonProperty("mode") @@ -63,10 +63,10 @@ public class NetworkSpecDNOKCIpsecConfig implements Editable , KubernetesResource +public class IPv4GatewayConfig implements Editable , KubernetesResource { @JsonProperty("internalMasqueradeSubnet") @@ -63,10 +63,10 @@ public class NetworkSpecDNOKCGCIpv4 implements Editable , KubernetesResource +public class IPv4OVNKubernetesConfig implements Editable , KubernetesResource { @JsonProperty("internalJoinSubnet") @@ -66,10 +66,10 @@ public class NetworkSpecDNOKCIpv6 implements Editable , KubernetesResource +public class IPv6GatewayConfig implements Editable , KubernetesResource { @JsonProperty("internalMasqueradeSubnet") @@ -63,10 +63,10 @@ public class NetworkSpecDNOKCGCIpv6 implements Editable , KubernetesResource +public class IPv6OVNKubernetesConfig implements Editable , KubernetesResource { @JsonProperty("internalJoinSubnet") @@ -66,10 +66,10 @@ public class NetworkSpecDNOKCIpv4 implements Editable , KubernetesResource +public class Ingress implements Editable , KubernetesResource { @JsonProperty("clientDownloadsURL") @@ -66,10 +66,10 @@ public class ConsoleSpecIngress implements Editable , * No args constructor for use in serialization * */ - public ConsoleSpecIngress() { + public Ingress() { } - public ConsoleSpecIngress(String clientDownloadsURL, String consoleURL) { + public Ingress(String clientDownloadsURL, String consoleURL) { super(); this.clientDownloadsURL = clientDownloadsURL; this.consoleURL = consoleURL; @@ -96,12 +96,12 @@ public void setConsoleURL(String consoleURL) { } @JsonIgnore - public ConsoleSpecIngressBuilder edit() { - return new ConsoleSpecIngressBuilder(this); + public IngressBuilder edit() { + return new IngressBuilder(this); } @JsonIgnore - public ConsoleSpecIngressBuilder toBuilder() { + public IngressBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerCaptureHTTPCookie.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerCaptureHTTPCookie.java new file mode 100644 index 00000000000..d4e61f3c7ed --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerCaptureHTTPCookie.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "matchType", + "maxLength", + "name", + "namePrefix" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class IngressControllerCaptureHTTPCookie implements Editable , KubernetesResource +{ + + @JsonProperty("matchType") + private String matchType; + @JsonProperty("maxLength") + private Integer maxLength; + @JsonProperty("name") + private String name; + @JsonProperty("namePrefix") + private String namePrefix; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IngressControllerCaptureHTTPCookie() { + } + + public IngressControllerCaptureHTTPCookie(String matchType, Integer maxLength, String name, String namePrefix) { + super(); + this.matchType = matchType; + this.maxLength = maxLength; + this.name = name; + this.namePrefix = namePrefix; + } + + @JsonProperty("matchType") + public String getMatchType() { + return matchType; + } + + @JsonProperty("matchType") + public void setMatchType(String matchType) { + this.matchType = matchType; + } + + @JsonProperty("maxLength") + public Integer getMaxLength() { + return maxLength; + } + + @JsonProperty("maxLength") + public void setMaxLength(Integer maxLength) { + this.maxLength = maxLength; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namePrefix") + public String getNamePrefix() { + return namePrefix; + } + + @JsonProperty("namePrefix") + public void setNamePrefix(String namePrefix) { + this.namePrefix = namePrefix; + } + + @JsonIgnore + public IngressControllerCaptureHTTPCookieBuilder edit() { + return new IngressControllerCaptureHTTPCookieBuilder(this); + } + + @JsonIgnore + public IngressControllerCaptureHTTPCookieBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHttpErrorCodePages.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerCaptureHTTPCookieUnion.java similarity index 73% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHttpErrorCodePages.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerCaptureHTTPCookieUnion.java index 5f2ab82c5d3..dad4625a047 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHttpErrorCodePages.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerCaptureHTTPCookieUnion.java @@ -31,7 +31,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "matchType", + "name", + "namePrefix" }) @ToString @EqualsAndHashCode @@ -51,11 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecHttpErrorCodePages implements Editable , KubernetesResource +public class IngressControllerCaptureHTTPCookieUnion implements Editable , KubernetesResource { + @JsonProperty("matchType") + private String matchType; @JsonProperty("name") private String name; + @JsonProperty("namePrefix") + private String namePrefix; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,12 +69,24 @@ public class IngressControllerSpecHttpErrorCodePages implements Editable , KubernetesResource +public class IngressControllerCaptureHTTPHeader implements Editable , KubernetesResource { + @JsonProperty("maxLength") + private Integer maxLength; @JsonProperty("name") private String name; @JsonIgnore @@ -63,14 +66,25 @@ public class IngressControllerSpecDefaultCertificate implements Editable , KubernetesResource +public class IngressControllerCaptureHTTPHeaders implements Editable , KubernetesResource { @JsonProperty("request") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object request; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List request = new ArrayList<>(); @JsonProperty("response") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object response; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List response = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,44 +70,44 @@ public class IngressControllerSpecLAHttpCaptureHeaders implements Editable request, List response) { super(); this.request = request; this.response = response; } @JsonProperty("request") - public Object getRequest() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getRequest() { return request; } @JsonProperty("request") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setRequest(Object request) { + public void setRequest(List request) { this.request = request; } @JsonProperty("response") - public Object getResponse() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getResponse() { return response; } @JsonProperty("response") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setResponse(Object response) { + public void setResponse(List response) { this.response = response; } @JsonIgnore - public IngressControllerSpecLAHttpCaptureHeadersBuilder edit() { - return new IngressControllerSpecLAHttpCaptureHeadersBuilder(this); + public IngressControllerCaptureHTTPHeadersBuilder edit() { + return new IngressControllerCaptureHTTPHeadersBuilder(this); } @JsonIgnore - public IngressControllerSpecLAHttpCaptureHeadersBuilder toBuilder() { + public IngressControllerCaptureHTTPHeadersBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARequest.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPHeader.java similarity index 84% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARequest.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPHeader.java index 04da33f90d8..e857713481f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARequest.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPHeader.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecHHARequest implements Editable , KubernetesResource +public class IngressControllerHTTPHeader implements Editable , KubernetesResource { @JsonProperty("action") - private IngressControllerSpecHHARAction action; + private IngressControllerHTTPHeaderActionUnion action; @JsonProperty("name") private String name; @JsonIgnore @@ -66,22 +66,22 @@ public class IngressControllerSpecHHARequest implements Editable , KubernetesResource +public class IngressControllerHTTPHeaderActionUnion implements Editable , KubernetesResource { @JsonProperty("set") - private IngressControllerSpecHHARASet_1 set; + private IngressControllerSetHTTPHeader set; @JsonProperty("type") private String type; @JsonIgnore @@ -66,22 +66,22 @@ public class IngressControllerSpecHHARAction_1 implements Editable , KubernetesResource +public class IngressControllerHTTPHeaderActions implements Editable , KubernetesResource { @JsonProperty("request") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List request = new ArrayList<>(); + private List request = new ArrayList<>(); @JsonProperty("response") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List response = new ArrayList<>(); + private List response = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,10 +70,10 @@ public class IngressControllerSpecHHActions implements Editable request, List response) { + public IngressControllerHTTPHeaderActions(List request, List response) { super(); this.request = request; this.response = response; @@ -81,33 +81,33 @@ public IngressControllerSpecHHActions(List requ @JsonProperty("request") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRequest() { + public List getRequest() { return request; } @JsonProperty("request") - public void setRequest(List request) { + public void setRequest(List request) { this.request = request; } @JsonProperty("response") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getResponse() { + public List getResponse() { return response; } @JsonProperty("response") - public void setResponse(List response) { + public void setResponse(List response) { this.response = response; } @JsonIgnore - public IngressControllerSpecHHActionsBuilder edit() { - return new IngressControllerSpecHHActionsBuilder(this); + public IngressControllerHTTPHeaderActionsBuilder edit() { + return new IngressControllerHTTPHeaderActionsBuilder(this); } @JsonIgnore - public IngressControllerSpecHHActionsBuilder toBuilder() { + public IngressControllerHTTPHeaderActionsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHttpHeaders.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPHeaders.java similarity index 76% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHttpHeaders.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPHeaders.java index 7a023205331..c64da51cd97 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHttpHeaders.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPHeaders.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.operator.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -54,18 +56,18 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecHttpHeaders implements Editable , KubernetesResource +public class IngressControllerHTTPHeaders implements Editable , KubernetesResource { @JsonProperty("actions") - private IngressControllerSpecHHActions actions; + private IngressControllerHTTPHeaderActions actions; @JsonProperty("forwardedHeaderPolicy") private String forwardedHeaderPolicy; @JsonProperty("headerNameCaseAdjustments") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object headerNameCaseAdjustments; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List headerNameCaseAdjustments = new ArrayList<>(); @JsonProperty("uniqueId") - private IngressControllerSpecHHUniqueId uniqueId; + private IngressControllerHTTPUniqueIdHeaderPolicy uniqueId; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,10 +75,10 @@ public class IngressControllerSpecHttpHeaders implements Editable headerNameCaseAdjustments, IngressControllerHTTPUniqueIdHeaderPolicy uniqueId) { super(); this.actions = actions; this.forwardedHeaderPolicy = forwardedHeaderPolicy; @@ -85,12 +87,12 @@ public IngressControllerSpecHttpHeaders(IngressControllerSpecHHActions actions, } @JsonProperty("actions") - public IngressControllerSpecHHActions getActions() { + public IngressControllerHTTPHeaderActions getActions() { return actions; } @JsonProperty("actions") - public void setActions(IngressControllerSpecHHActions actions) { + public void setActions(IngressControllerHTTPHeaderActions actions) { this.actions = actions; } @@ -105,33 +107,33 @@ public void setForwardedHeaderPolicy(String forwardedHeaderPolicy) { } @JsonProperty("headerNameCaseAdjustments") - public Object getHeaderNameCaseAdjustments() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getHeaderNameCaseAdjustments() { return headerNameCaseAdjustments; } @JsonProperty("headerNameCaseAdjustments") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setHeaderNameCaseAdjustments(Object headerNameCaseAdjustments) { + public void setHeaderNameCaseAdjustments(List headerNameCaseAdjustments) { this.headerNameCaseAdjustments = headerNameCaseAdjustments; } @JsonProperty("uniqueId") - public IngressControllerSpecHHUniqueId getUniqueId() { + public IngressControllerHTTPUniqueIdHeaderPolicy getUniqueId() { return uniqueId; } @JsonProperty("uniqueId") - public void setUniqueId(IngressControllerSpecHHUniqueId uniqueId) { + public void setUniqueId(IngressControllerHTTPUniqueIdHeaderPolicy uniqueId) { this.uniqueId = uniqueId; } @JsonIgnore - public IngressControllerSpecHttpHeadersBuilder edit() { - return new IngressControllerSpecHttpHeadersBuilder(this); + public IngressControllerHTTPHeadersBuilder edit() { + return new IngressControllerHTTPHeadersBuilder(this); } @JsonIgnore - public IngressControllerSpecHttpHeadersBuilder toBuilder() { + public IngressControllerHTTPHeadersBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHUniqueId.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPUniqueIdHeaderPolicy.java similarity index 87% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHUniqueId.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPUniqueIdHeaderPolicy.java index 8a3fcff5f06..291451d12c2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHUniqueId.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerHTTPUniqueIdHeaderPolicy.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecHHUniqueId implements Editable , KubernetesResource +public class IngressControllerHTTPUniqueIdHeaderPolicy implements Editable , KubernetesResource { @JsonProperty("format") @@ -66,10 +66,10 @@ public class IngressControllerSpecHHUniqueId implements Editable , KubernetesResource +public class IngressControllerLogging implements Editable , KubernetesResource { @JsonProperty("access") - private IngressControllerSpecLAccess access; + private AccessLogging access; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class IngressControllerSpecLogging implements Editable , KubernetesResource +public class IngressControllerSetHTTPHeader implements Editable , KubernetesResource { @JsonProperty("value") @@ -63,10 +63,10 @@ public class IngressControllerSpecHHARASet implements Editable , KubernetesResource -{ - - @JsonProperty("connectionIdleTimeout") - private String connectionIdleTimeout; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerSpecEPSLBPPAwsClassicLoadBalancer() { - } - - public IngressControllerSpecEPSLBPPAwsClassicLoadBalancer(String connectionIdleTimeout) { - super(); - this.connectionIdleTimeout = connectionIdleTimeout; - } - - @JsonProperty("connectionIdleTimeout") - public String getConnectionIdleTimeout() { - return connectionIdleTimeout; - } - - @JsonProperty("connectionIdleTimeout") - public void setConnectionIdleTimeout(String connectionIdleTimeout) { - this.connectionIdleTimeout = connectionIdleTimeout; - } - - @JsonIgnore - public IngressControllerSpecEPSLBPPAwsClassicLoadBalancerBuilder edit() { - return new IngressControllerSpecEPSLBPPAwsClassicLoadBalancerBuilder(this); - } - - @JsonIgnore - public IngressControllerSpecEPSLBPPAwsClassicLoadBalancerBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARASet_1.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARASet_1.java deleted file mode 100644 index 4c3bded3b8d..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARASet_1.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerSpecHHARASet_1 implements Editable , KubernetesResource -{ - - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerSpecHHARASet_1() { - } - - public IngressControllerSpecHHARASet_1(String value) { - super(); - this.value = value; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public IngressControllerSpecHHARASet_1Builder edit() { - return new IngressControllerSpecHHARASet_1Builder(this); - } - - @JsonIgnore - public IngressControllerSpecHHARASet_1Builder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNPTolerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNPTolerations.java deleted file mode 100644 index a45b2a26392..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNPTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerSpecNPTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerSpecNPTolerations() { - } - - public IngressControllerSpecNPTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public IngressControllerSpecNPTolerationsBuilder edit() { - return new IngressControllerSpecNPTolerationsBuilder(this); - } - - @JsonIgnore - public IngressControllerSpecNPTolerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNamespaceSelector.java deleted file mode 100644 index 3b21fd4ed52..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerSpecNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerSpecNamespaceSelector() { - } - - public IngressControllerSpecNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public IngressControllerSpecNamespaceSelectorBuilder edit() { - return new IngressControllerSpecNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public IngressControllerSpecNamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecRouteSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecRouteSelector.java deleted file mode 100644 index 30d706fd2fb..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecRouteSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerSpecRouteSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerSpecRouteSelector() { - } - - public IngressControllerSpecRouteSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public IngressControllerSpecRouteSelectorBuilder edit() { - return new IngressControllerSpecRouteSelectorBuilder(this); - } - - @JsonIgnore - public IngressControllerSpecRouteSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java index 4e96a445ef5..42cc0c546b7 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.TLSProfileSpec; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -68,21 +69,21 @@ public class IngressControllerStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("domain") private String domain; @JsonProperty("endpointPublishingStrategy") - private IngressControllerStatusEndpointPublishingStrategy endpointPublishingStrategy; + private EndpointPublishingStrategy endpointPublishingStrategy; @JsonProperty("namespaceSelector") - private IngressControllerStatusNamespaceSelector namespaceSelector; + private LabelSelector namespaceSelector; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("routeSelector") - private IngressControllerStatusRouteSelector routeSelector; + private LabelSelector routeSelector; @JsonProperty("selector") private String selector; @JsonProperty("tlsProfile") - private IngressControllerStatusTlsProfile tlsProfile; + private TLSProfileSpec tlsProfile; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -93,7 +94,7 @@ public class IngressControllerStatus implements Editable conditions, String domain, IngressControllerStatusEndpointPublishingStrategy endpointPublishingStrategy, IngressControllerStatusNamespaceSelector namespaceSelector, Long observedGeneration, IngressControllerStatusRouteSelector routeSelector, String selector, IngressControllerStatusTlsProfile tlsProfile) { + public IngressControllerStatus(Integer availableReplicas, List conditions, String domain, EndpointPublishingStrategy endpointPublishingStrategy, LabelSelector namespaceSelector, Long observedGeneration, LabelSelector routeSelector, String selector, TLSProfileSpec tlsProfile) { super(); this.availableReplicas = availableReplicas; this.conditions = conditions; @@ -118,12 +119,12 @@ public void setAvailableReplicas(Integer availableReplicas) { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @@ -138,22 +139,22 @@ public void setDomain(String domain) { } @JsonProperty("endpointPublishingStrategy") - public IngressControllerStatusEndpointPublishingStrategy getEndpointPublishingStrategy() { + public EndpointPublishingStrategy getEndpointPublishingStrategy() { return endpointPublishingStrategy; } @JsonProperty("endpointPublishingStrategy") - public void setEndpointPublishingStrategy(IngressControllerStatusEndpointPublishingStrategy endpointPublishingStrategy) { + public void setEndpointPublishingStrategy(EndpointPublishingStrategy endpointPublishingStrategy) { this.endpointPublishingStrategy = endpointPublishingStrategy; } @JsonProperty("namespaceSelector") - public IngressControllerStatusNamespaceSelector getNamespaceSelector() { + public LabelSelector getNamespaceSelector() { return namespaceSelector; } @JsonProperty("namespaceSelector") - public void setNamespaceSelector(IngressControllerStatusNamespaceSelector namespaceSelector) { + public void setNamespaceSelector(LabelSelector namespaceSelector) { this.namespaceSelector = namespaceSelector; } @@ -168,12 +169,12 @@ public void setObservedGeneration(Long observedGeneration) { } @JsonProperty("routeSelector") - public IngressControllerStatusRouteSelector getRouteSelector() { + public LabelSelector getRouteSelector() { return routeSelector; } @JsonProperty("routeSelector") - public void setRouteSelector(IngressControllerStatusRouteSelector routeSelector) { + public void setRouteSelector(LabelSelector routeSelector) { this.routeSelector = routeSelector; } @@ -188,12 +189,12 @@ public void setSelector(String selector) { } @JsonProperty("tlsProfile") - public IngressControllerStatusTlsProfile getTlsProfile() { + public TLSProfileSpec getTlsProfile() { return tlsProfile; } @JsonProperty("tlsProfile") - public void setTlsProfile(IngressControllerStatusTlsProfile tlsProfile) { + public void setTlsProfile(TLSProfileSpec tlsProfile) { this.tlsProfile = tlsProfile; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSHostNetwork.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSHostNetwork.java deleted file mode 100644 index efb8d4dc144..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSHostNetwork.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "httpPort", - "httpsPort", - "protocol", - "statsPort" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSHostNetwork implements Editable , KubernetesResource -{ - - @JsonProperty("httpPort") - private Integer httpPort; - @JsonProperty("httpsPort") - private Integer httpsPort; - @JsonProperty("protocol") - private String protocol; - @JsonProperty("statsPort") - private Integer statsPort; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSHostNetwork() { - } - - public IngressControllerStatusEPSHostNetwork(Integer httpPort, Integer httpsPort, String protocol, Integer statsPort) { - super(); - this.httpPort = httpPort; - this.httpsPort = httpsPort; - this.protocol = protocol; - this.statsPort = statsPort; - } - - @JsonProperty("httpPort") - public Integer getHttpPort() { - return httpPort; - } - - @JsonProperty("httpPort") - public void setHttpPort(Integer httpPort) { - this.httpPort = httpPort; - } - - @JsonProperty("httpsPort") - public Integer getHttpsPort() { - return httpsPort; - } - - @JsonProperty("httpsPort") - public void setHttpsPort(Integer httpsPort) { - this.httpsPort = httpsPort; - } - - @JsonProperty("protocol") - public String getProtocol() { - return protocol; - } - - @JsonProperty("protocol") - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - @JsonProperty("statsPort") - public Integer getStatsPort() { - return statsPort; - } - - @JsonProperty("statsPort") - public void setStatsPort(Integer statsPort) { - this.statsPort = statsPort; - } - - @JsonIgnore - public IngressControllerStatusEPSHostNetworkBuilder edit() { - return new IngressControllerStatusEPSHostNetworkBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSHostNetworkBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPAws.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPAws.java deleted file mode 100644 index b099eaf7aba..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPAws.java +++ /dev/null @@ -1,138 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "classicLoadBalancer", - "networkLoadBalancer", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSLBPPAws implements Editable , KubernetesResource -{ - - @JsonProperty("classicLoadBalancer") - private IngressControllerStatusEPSLBPPAwsClassicLoadBalancer classicLoadBalancer; - @JsonProperty("networkLoadBalancer") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object networkLoadBalancer; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSLBPPAws() { - } - - public IngressControllerStatusEPSLBPPAws(IngressControllerStatusEPSLBPPAwsClassicLoadBalancer classicLoadBalancer, Object networkLoadBalancer, String type) { - super(); - this.classicLoadBalancer = classicLoadBalancer; - this.networkLoadBalancer = networkLoadBalancer; - this.type = type; - } - - @JsonProperty("classicLoadBalancer") - public IngressControllerStatusEPSLBPPAwsClassicLoadBalancer getClassicLoadBalancer() { - return classicLoadBalancer; - } - - @JsonProperty("classicLoadBalancer") - public void setClassicLoadBalancer(IngressControllerStatusEPSLBPPAwsClassicLoadBalancer classicLoadBalancer) { - this.classicLoadBalancer = classicLoadBalancer; - } - - @JsonProperty("networkLoadBalancer") - public Object getNetworkLoadBalancer() { - return networkLoadBalancer; - } - - @JsonProperty("networkLoadBalancer") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setNetworkLoadBalancer(Object networkLoadBalancer) { - this.networkLoadBalancer = networkLoadBalancer; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public IngressControllerStatusEPSLBPPAwsBuilder edit() { - return new IngressControllerStatusEPSLBPPAwsBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSLBPPAwsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPIbm.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPIbm.java deleted file mode 100644 index 32c79cc2947..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPIbm.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "protocol" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSLBPPIbm implements Editable , KubernetesResource -{ - - @JsonProperty("protocol") - private String protocol; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSLBPPIbm() { - } - - public IngressControllerStatusEPSLBPPIbm(String protocol) { - super(); - this.protocol = protocol; - } - - @JsonProperty("protocol") - public String getProtocol() { - return protocol; - } - - @JsonProperty("protocol") - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - @JsonIgnore - public IngressControllerStatusEPSLBPPIbmBuilder edit() { - return new IngressControllerStatusEPSLBPPIbmBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSLBPPIbmBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBProviderParameters.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBProviderParameters.java deleted file mode 100644 index 8e0680b58c9..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBProviderParameters.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "aws", - "gcp", - "ibm", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSLBProviderParameters implements Editable , KubernetesResource -{ - - @JsonProperty("aws") - private IngressControllerStatusEPSLBPPAws aws; - @JsonProperty("gcp") - private IngressControllerStatusEPSLBPPGcp gcp; - @JsonProperty("ibm") - private IngressControllerStatusEPSLBPPIbm ibm; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSLBProviderParameters() { - } - - public IngressControllerStatusEPSLBProviderParameters(IngressControllerStatusEPSLBPPAws aws, IngressControllerStatusEPSLBPPGcp gcp, IngressControllerStatusEPSLBPPIbm ibm, String type) { - super(); - this.aws = aws; - this.gcp = gcp; - this.ibm = ibm; - this.type = type; - } - - @JsonProperty("aws") - public IngressControllerStatusEPSLBPPAws getAws() { - return aws; - } - - @JsonProperty("aws") - public void setAws(IngressControllerStatusEPSLBPPAws aws) { - this.aws = aws; - } - - @JsonProperty("gcp") - public IngressControllerStatusEPSLBPPGcp getGcp() { - return gcp; - } - - @JsonProperty("gcp") - public void setGcp(IngressControllerStatusEPSLBPPGcp gcp) { - this.gcp = gcp; - } - - @JsonProperty("ibm") - public IngressControllerStatusEPSLBPPIbm getIbm() { - return ibm; - } - - @JsonProperty("ibm") - public void setIbm(IngressControllerStatusEPSLBPPIbm ibm) { - this.ibm = ibm; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public IngressControllerStatusEPSLBProviderParametersBuilder edit() { - return new IngressControllerStatusEPSLBProviderParametersBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSLBProviderParametersBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLoadBalancer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLoadBalancer.java deleted file mode 100644 index e152095a0a0..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLoadBalancer.java +++ /dev/null @@ -1,152 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "allowedSourceRanges", - "dnsManagementPolicy", - "providerParameters", - "scope" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSLoadBalancer implements Editable , KubernetesResource -{ - - @JsonProperty("allowedSourceRanges") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object allowedSourceRanges; - @JsonProperty("dnsManagementPolicy") - private String dnsManagementPolicy; - @JsonProperty("providerParameters") - private IngressControllerStatusEPSLBProviderParameters providerParameters; - @JsonProperty("scope") - private String scope; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSLoadBalancer() { - } - - public IngressControllerStatusEPSLoadBalancer(Object allowedSourceRanges, String dnsManagementPolicy, IngressControllerStatusEPSLBProviderParameters providerParameters, String scope) { - super(); - this.allowedSourceRanges = allowedSourceRanges; - this.dnsManagementPolicy = dnsManagementPolicy; - this.providerParameters = providerParameters; - this.scope = scope; - } - - @JsonProperty("allowedSourceRanges") - public Object getAllowedSourceRanges() { - return allowedSourceRanges; - } - - @JsonProperty("allowedSourceRanges") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setAllowedSourceRanges(Object allowedSourceRanges) { - this.allowedSourceRanges = allowedSourceRanges; - } - - @JsonProperty("dnsManagementPolicy") - public String getDnsManagementPolicy() { - return dnsManagementPolicy; - } - - @JsonProperty("dnsManagementPolicy") - public void setDnsManagementPolicy(String dnsManagementPolicy) { - this.dnsManagementPolicy = dnsManagementPolicy; - } - - @JsonProperty("providerParameters") - public IngressControllerStatusEPSLBProviderParameters getProviderParameters() { - return providerParameters; - } - - @JsonProperty("providerParameters") - public void setProviderParameters(IngressControllerStatusEPSLBProviderParameters providerParameters) { - this.providerParameters = providerParameters; - } - - @JsonProperty("scope") - public String getScope() { - return scope; - } - - @JsonProperty("scope") - public void setScope(String scope) { - this.scope = scope; - } - - @JsonIgnore - public IngressControllerStatusEPSLoadBalancerBuilder edit() { - return new IngressControllerStatusEPSLoadBalancerBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSLoadBalancerBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSNodePort.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSNodePort.java deleted file mode 100644 index 40d74de1d53..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSNodePort.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "protocol" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSNodePort implements Editable , KubernetesResource -{ - - @JsonProperty("protocol") - private String protocol; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSNodePort() { - } - - public IngressControllerStatusEPSNodePort(String protocol) { - super(); - this.protocol = protocol; - } - - @JsonProperty("protocol") - public String getProtocol() { - return protocol; - } - - @JsonProperty("protocol") - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - @JsonIgnore - public IngressControllerStatusEPSNodePortBuilder edit() { - return new IngressControllerStatusEPSNodePortBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSNodePortBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSPrivate.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSPrivate.java deleted file mode 100644 index 277c4b40ad4..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSPrivate.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "protocol" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEPSPrivate implements Editable , KubernetesResource -{ - - @JsonProperty("protocol") - private String protocol; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEPSPrivate() { - } - - public IngressControllerStatusEPSPrivate(String protocol) { - super(); - this.protocol = protocol; - } - - @JsonProperty("protocol") - public String getProtocol() { - return protocol; - } - - @JsonProperty("protocol") - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - @JsonIgnore - public IngressControllerStatusEPSPrivateBuilder edit() { - return new IngressControllerStatusEPSPrivateBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEPSPrivateBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEndpointPublishingStrategy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEndpointPublishingStrategy.java deleted file mode 100644 index b2628c0c897..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEndpointPublishingStrategy.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "hostNetwork", - "loadBalancer", - "nodePort", - "private", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusEndpointPublishingStrategy implements Editable , KubernetesResource -{ - - @JsonProperty("hostNetwork") - private IngressControllerStatusEPSHostNetwork hostNetwork; - @JsonProperty("loadBalancer") - private IngressControllerStatusEPSLoadBalancer loadBalancer; - @JsonProperty("nodePort") - private IngressControllerStatusEPSNodePort nodePort; - @JsonProperty("private") - private IngressControllerStatusEPSPrivate _private; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusEndpointPublishingStrategy() { - } - - public IngressControllerStatusEndpointPublishingStrategy(IngressControllerStatusEPSHostNetwork hostNetwork, IngressControllerStatusEPSLoadBalancer loadBalancer, IngressControllerStatusEPSNodePort nodePort, IngressControllerStatusEPSPrivate _private, String type) { - super(); - this.hostNetwork = hostNetwork; - this.loadBalancer = loadBalancer; - this.nodePort = nodePort; - this._private = _private; - this.type = type; - } - - @JsonProperty("hostNetwork") - public IngressControllerStatusEPSHostNetwork getHostNetwork() { - return hostNetwork; - } - - @JsonProperty("hostNetwork") - public void setHostNetwork(IngressControllerStatusEPSHostNetwork hostNetwork) { - this.hostNetwork = hostNetwork; - } - - @JsonProperty("loadBalancer") - public IngressControllerStatusEPSLoadBalancer getLoadBalancer() { - return loadBalancer; - } - - @JsonProperty("loadBalancer") - public void setLoadBalancer(IngressControllerStatusEPSLoadBalancer loadBalancer) { - this.loadBalancer = loadBalancer; - } - - @JsonProperty("nodePort") - public IngressControllerStatusEPSNodePort getNodePort() { - return nodePort; - } - - @JsonProperty("nodePort") - public void setNodePort(IngressControllerStatusEPSNodePort nodePort) { - this.nodePort = nodePort; - } - - @JsonProperty("private") - public IngressControllerStatusEPSPrivate getPrivate() { - return _private; - } - - @JsonProperty("private") - public void setPrivate(IngressControllerStatusEPSPrivate _private) { - this._private = _private; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public IngressControllerStatusEndpointPublishingStrategyBuilder edit() { - return new IngressControllerStatusEndpointPublishingStrategyBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusEndpointPublishingStrategyBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusNamespaceSelector.java deleted file mode 100644 index 593af21f49c..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusNamespaceSelector() { - } - - public IngressControllerStatusNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public IngressControllerStatusNamespaceSelectorBuilder edit() { - return new IngressControllerStatusNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusNamespaceSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusRouteSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusRouteSelector.java deleted file mode 100644 index 32d0e3213c3..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusRouteSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class IngressControllerStatusRouteSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressControllerStatusRouteSelector() { - } - - public IngressControllerStatusRouteSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public IngressControllerStatusRouteSelectorBuilder edit() { - return new IngressControllerStatusRouteSelectorBuilder(this); - } - - @JsonIgnore - public IngressControllerStatusRouteSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecTuningOptions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java similarity index 91% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecTuningOptions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java index 05f8c64bc85..a7f43c67aa4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecTuningOptions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java @@ -63,7 +63,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecTuningOptions implements Editable , KubernetesResource +public class IngressControllerTuningOptions implements Editable , KubernetesResource { @JsonProperty("clientFinTimeout") @@ -99,10 +99,10 @@ public class IngressControllerSpecTuningOptions implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("gatherStatus") - private InsightsOperatorStatusGatherStatus gatherStatus; + private GatherStatus gatherStatus; @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("insightsReport") - private InsightsOperatorStatusInsightsReport insightsReport; + private InsightsReport insightsReport; + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -88,12 +91,13 @@ public class InsightsOperatorStatus implements Editable conditions, InsightsOperatorStatusGatherStatus gatherStatus, List generations, InsightsOperatorStatusInsightsReport insightsReport, Long observedGeneration, Integer readyReplicas, String version) { + public InsightsOperatorStatus(List conditions, GatherStatus gatherStatus, List generations, InsightsReport insightsReport, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.gatherStatus = gatherStatus; this.generations = generations; this.insightsReport = insightsReport; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -101,46 +105,56 @@ public InsightsOperatorStatus(List conditions, @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("gatherStatus") - public InsightsOperatorStatusGatherStatus getGatherStatus() { + public GatherStatus getGatherStatus() { return gatherStatus; } @JsonProperty("gatherStatus") - public void setGatherStatus(InsightsOperatorStatusGatherStatus gatherStatus) { + public void setGatherStatus(GatherStatus gatherStatus) { this.gatherStatus = gatherStatus; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } @JsonProperty("insightsReport") - public InsightsOperatorStatusInsightsReport getInsightsReport() { + public InsightsReport getInsightsReport() { return insightsReport; } @JsonProperty("insightsReport") - public void setInsightsReport(InsightsOperatorStatusInsightsReport insightsReport) { + public void setInsightsReport(InsightsReport insightsReport) { this.insightsReport = insightsReport; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusGenerations.java deleted file mode 100644 index 73a06ea03dc..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class InsightsOperatorStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InsightsOperatorStatusGenerations() { - } - - public InsightsOperatorStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public InsightsOperatorStatusGenerationsBuilder edit() { - return new InsightsOperatorStatusGenerationsBuilder(this); - } - - @JsonIgnore - public InsightsOperatorStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusInsightsReport.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsReport.java similarity index 82% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusInsightsReport.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsReport.java index 3e386efe4b7..685b1c6263e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusInsightsReport.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsReport.java @@ -54,14 +54,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InsightsOperatorStatusInsightsReport implements Editable , KubernetesResource +public class InsightsReport implements Editable , KubernetesResource { @JsonProperty("downloadedAt") private String downloadedAt; @JsonProperty("healthChecks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List healthChecks = new ArrayList<>(); + private List healthChecks = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class InsightsOperatorStatusInsightsReport implements Editable healthChecks) { + public InsightsReport(String downloadedAt, List healthChecks) { super(); this.downloadedAt = downloadedAt; this.healthChecks = healthChecks; @@ -90,22 +90,22 @@ public void setDownloadedAt(String downloadedAt) { @JsonProperty("healthChecks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getHealthChecks() { + public List getHealthChecks() { return healthChecks; } @JsonProperty("healthChecks") - public void setHealthChecks(List healthChecks) { + public void setHealthChecks(List healthChecks) { this.healthChecks = healthChecks; } @JsonIgnore - public InsightsOperatorStatusInsightsReportBuilder edit() { - return new InsightsOperatorStatusInsightsReportBuilder(this); + public InsightsReportBuilder edit() { + return new InsightsReportBuilder(this); } @JsonIgnore - public InsightsOperatorStatusInsightsReportBuilder toBuilder() { + public InsightsReportBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java index 3620bcc1aad..d3446c6813e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java @@ -66,24 +66,24 @@ public class KubeAPIServerStatus implements Editable @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("latestAvailableRevision") private Integer latestAvailableRevision; @JsonProperty("latestAvailableRevisionReason") private String latestAvailableRevisionReason; @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nodeStatuses = new ArrayList<>(); + private List nodeStatuses = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") private Integer readyReplicas; @JsonProperty("serviceAccountIssuers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List serviceAccountIssuers = new ArrayList<>(); + private List serviceAccountIssuers = new ArrayList<>(); @JsonProperty("version") private String version; @JsonIgnore @@ -96,7 +96,7 @@ public class KubeAPIServerStatus implements Editable public KubeAPIServerStatus() { } - public KubeAPIServerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, List serviceAccountIssuers, String version) { + public KubeAPIServerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, List serviceAccountIssuers, String version) { super(); this.conditions = conditions; this.generations = generations; @@ -111,23 +111,23 @@ public KubeAPIServerStatus(List conditions, List< @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } @@ -153,12 +153,12 @@ public void setLatestAvailableRevisionReason(String latestAvailableRevisionReaso @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNodeStatuses() { + public List getNodeStatuses() { return nodeStatuses; } @JsonProperty("nodeStatuses") - public void setNodeStatuses(List nodeStatuses) { + public void setNodeStatuses(List nodeStatuses) { this.nodeStatuses = nodeStatuses; } @@ -184,12 +184,12 @@ public void setReadyReplicas(Integer readyReplicas) { @JsonProperty("serviceAccountIssuers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceAccountIssuers() { + public List getServiceAccountIssuers() { return serviceAccountIssuers; } @JsonProperty("serviceAccountIssuers") - public void setServiceAccountIssuers(List serviceAccountIssuers) { + public void setServiceAccountIssuers(List serviceAccountIssuers) { this.serviceAccountIssuers = serviceAccountIssuers; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusConditions.java deleted file mode 100644 index 831128c2ba5..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeAPIServerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeAPIServerStatusConditions() { - } - - public KubeAPIServerStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public KubeAPIServerStatusConditionsBuilder edit() { - return new KubeAPIServerStatusConditionsBuilder(this); - } - - @JsonIgnore - public KubeAPIServerStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusGenerations.java deleted file mode 100644 index bae67eabc27..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeAPIServerStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeAPIServerStatusGenerations() { - } - - public KubeAPIServerStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public KubeAPIServerStatusGenerationsBuilder edit() { - return new KubeAPIServerStatusGenerationsBuilder(this); - } - - @JsonIgnore - public KubeAPIServerStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusNodeStatuses.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusNodeStatuses.java deleted file mode 100644 index 033a7c5a701..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusNodeStatuses.java +++ /dev/null @@ -1,224 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "currentRevision", - "lastFailedCount", - "lastFailedReason", - "lastFailedRevision", - "lastFailedRevisionErrors", - "lastFailedTime", - "lastFallbackCount", - "nodeName", - "targetRevision" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeAPIServerStatusNodeStatuses implements Editable , KubernetesResource -{ - - @JsonProperty("currentRevision") - private Integer currentRevision; - @JsonProperty("lastFailedCount") - private Integer lastFailedCount; - @JsonProperty("lastFailedReason") - private String lastFailedReason; - @JsonProperty("lastFailedRevision") - private Integer lastFailedRevision; - @JsonProperty("lastFailedRevisionErrors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List lastFailedRevisionErrors = new ArrayList<>(); - @JsonProperty("lastFailedTime") - private String lastFailedTime; - @JsonProperty("lastFallbackCount") - private Integer lastFallbackCount; - @JsonProperty("nodeName") - private String nodeName; - @JsonProperty("targetRevision") - private Integer targetRevision; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeAPIServerStatusNodeStatuses() { - } - - public KubeAPIServerStatusNodeStatuses(Integer currentRevision, Integer lastFailedCount, String lastFailedReason, Integer lastFailedRevision, List lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, String nodeName, Integer targetRevision) { - super(); - this.currentRevision = currentRevision; - this.lastFailedCount = lastFailedCount; - this.lastFailedReason = lastFailedReason; - this.lastFailedRevision = lastFailedRevision; - this.lastFailedRevisionErrors = lastFailedRevisionErrors; - this.lastFailedTime = lastFailedTime; - this.lastFallbackCount = lastFallbackCount; - this.nodeName = nodeName; - this.targetRevision = targetRevision; - } - - @JsonProperty("currentRevision") - public Integer getCurrentRevision() { - return currentRevision; - } - - @JsonProperty("currentRevision") - public void setCurrentRevision(Integer currentRevision) { - this.currentRevision = currentRevision; - } - - @JsonProperty("lastFailedCount") - public Integer getLastFailedCount() { - return lastFailedCount; - } - - @JsonProperty("lastFailedCount") - public void setLastFailedCount(Integer lastFailedCount) { - this.lastFailedCount = lastFailedCount; - } - - @JsonProperty("lastFailedReason") - public String getLastFailedReason() { - return lastFailedReason; - } - - @JsonProperty("lastFailedReason") - public void setLastFailedReason(String lastFailedReason) { - this.lastFailedReason = lastFailedReason; - } - - @JsonProperty("lastFailedRevision") - public Integer getLastFailedRevision() { - return lastFailedRevision; - } - - @JsonProperty("lastFailedRevision") - public void setLastFailedRevision(Integer lastFailedRevision) { - this.lastFailedRevision = lastFailedRevision; - } - - @JsonProperty("lastFailedRevisionErrors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLastFailedRevisionErrors() { - return lastFailedRevisionErrors; - } - - @JsonProperty("lastFailedRevisionErrors") - public void setLastFailedRevisionErrors(List lastFailedRevisionErrors) { - this.lastFailedRevisionErrors = lastFailedRevisionErrors; - } - - @JsonProperty("lastFailedTime") - public String getLastFailedTime() { - return lastFailedTime; - } - - @JsonProperty("lastFailedTime") - public void setLastFailedTime(String lastFailedTime) { - this.lastFailedTime = lastFailedTime; - } - - @JsonProperty("lastFallbackCount") - public Integer getLastFallbackCount() { - return lastFallbackCount; - } - - @JsonProperty("lastFallbackCount") - public void setLastFallbackCount(Integer lastFallbackCount) { - this.lastFallbackCount = lastFallbackCount; - } - - @JsonProperty("nodeName") - public String getNodeName() { - return nodeName; - } - - @JsonProperty("nodeName") - public void setNodeName(String nodeName) { - this.nodeName = nodeName; - } - - @JsonProperty("targetRevision") - public Integer getTargetRevision() { - return targetRevision; - } - - @JsonProperty("targetRevision") - public void setTargetRevision(Integer targetRevision) { - this.targetRevision = targetRevision; - } - - @JsonIgnore - public KubeAPIServerStatusNodeStatusesBuilder edit() { - return new KubeAPIServerStatusNodeStatusesBuilder(this); - } - - @JsonIgnore - public KubeAPIServerStatusNodeStatusesBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatus.java index a6a8b6dfc31..391cab63011 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatus.java @@ -65,17 +65,17 @@ public class KubeControllerManagerStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("latestAvailableRevision") private Integer latestAvailableRevision; @JsonProperty("latestAvailableRevisionReason") private String latestAvailableRevisionReason; @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nodeStatuses = new ArrayList<>(); + private List nodeStatuses = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -92,7 +92,7 @@ public class KubeControllerManagerStatus implements Editable conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { + public KubeControllerManagerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; @@ -106,23 +106,23 @@ public KubeControllerManagerStatus(List c @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } @@ -148,12 +148,12 @@ public void setLatestAvailableRevisionReason(String latestAvailableRevisionReaso @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNodeStatuses() { + public List getNodeStatuses() { return nodeStatuses; } @JsonProperty("nodeStatuses") - public void setNodeStatuses(List nodeStatuses) { + public void setNodeStatuses(List nodeStatuses) { this.nodeStatuses = nodeStatuses; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusConditions.java deleted file mode 100644 index 6046ff369c1..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeControllerManagerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeControllerManagerStatusConditions() { - } - - public KubeControllerManagerStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public KubeControllerManagerStatusConditionsBuilder edit() { - return new KubeControllerManagerStatusConditionsBuilder(this); - } - - @JsonIgnore - public KubeControllerManagerStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusGenerations.java deleted file mode 100644 index 33e40bab6a9..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeControllerManagerStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeControllerManagerStatusGenerations() { - } - - public KubeControllerManagerStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public KubeControllerManagerStatusGenerationsBuilder edit() { - return new KubeControllerManagerStatusGenerationsBuilder(this); - } - - @JsonIgnore - public KubeControllerManagerStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusNodeStatuses.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusNodeStatuses.java deleted file mode 100644 index 220e5cb7271..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManagerStatusNodeStatuses.java +++ /dev/null @@ -1,224 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "currentRevision", - "lastFailedCount", - "lastFailedReason", - "lastFailedRevision", - "lastFailedRevisionErrors", - "lastFailedTime", - "lastFallbackCount", - "nodeName", - "targetRevision" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeControllerManagerStatusNodeStatuses implements Editable , KubernetesResource -{ - - @JsonProperty("currentRevision") - private Integer currentRevision; - @JsonProperty("lastFailedCount") - private Integer lastFailedCount; - @JsonProperty("lastFailedReason") - private String lastFailedReason; - @JsonProperty("lastFailedRevision") - private Integer lastFailedRevision; - @JsonProperty("lastFailedRevisionErrors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List lastFailedRevisionErrors = new ArrayList<>(); - @JsonProperty("lastFailedTime") - private String lastFailedTime; - @JsonProperty("lastFallbackCount") - private Integer lastFallbackCount; - @JsonProperty("nodeName") - private String nodeName; - @JsonProperty("targetRevision") - private Integer targetRevision; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeControllerManagerStatusNodeStatuses() { - } - - public KubeControllerManagerStatusNodeStatuses(Integer currentRevision, Integer lastFailedCount, String lastFailedReason, Integer lastFailedRevision, List lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, String nodeName, Integer targetRevision) { - super(); - this.currentRevision = currentRevision; - this.lastFailedCount = lastFailedCount; - this.lastFailedReason = lastFailedReason; - this.lastFailedRevision = lastFailedRevision; - this.lastFailedRevisionErrors = lastFailedRevisionErrors; - this.lastFailedTime = lastFailedTime; - this.lastFallbackCount = lastFallbackCount; - this.nodeName = nodeName; - this.targetRevision = targetRevision; - } - - @JsonProperty("currentRevision") - public Integer getCurrentRevision() { - return currentRevision; - } - - @JsonProperty("currentRevision") - public void setCurrentRevision(Integer currentRevision) { - this.currentRevision = currentRevision; - } - - @JsonProperty("lastFailedCount") - public Integer getLastFailedCount() { - return lastFailedCount; - } - - @JsonProperty("lastFailedCount") - public void setLastFailedCount(Integer lastFailedCount) { - this.lastFailedCount = lastFailedCount; - } - - @JsonProperty("lastFailedReason") - public String getLastFailedReason() { - return lastFailedReason; - } - - @JsonProperty("lastFailedReason") - public void setLastFailedReason(String lastFailedReason) { - this.lastFailedReason = lastFailedReason; - } - - @JsonProperty("lastFailedRevision") - public Integer getLastFailedRevision() { - return lastFailedRevision; - } - - @JsonProperty("lastFailedRevision") - public void setLastFailedRevision(Integer lastFailedRevision) { - this.lastFailedRevision = lastFailedRevision; - } - - @JsonProperty("lastFailedRevisionErrors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLastFailedRevisionErrors() { - return lastFailedRevisionErrors; - } - - @JsonProperty("lastFailedRevisionErrors") - public void setLastFailedRevisionErrors(List lastFailedRevisionErrors) { - this.lastFailedRevisionErrors = lastFailedRevisionErrors; - } - - @JsonProperty("lastFailedTime") - public String getLastFailedTime() { - return lastFailedTime; - } - - @JsonProperty("lastFailedTime") - public void setLastFailedTime(String lastFailedTime) { - this.lastFailedTime = lastFailedTime; - } - - @JsonProperty("lastFallbackCount") - public Integer getLastFallbackCount() { - return lastFallbackCount; - } - - @JsonProperty("lastFallbackCount") - public void setLastFallbackCount(Integer lastFallbackCount) { - this.lastFallbackCount = lastFallbackCount; - } - - @JsonProperty("nodeName") - public String getNodeName() { - return nodeName; - } - - @JsonProperty("nodeName") - public void setNodeName(String nodeName) { - this.nodeName = nodeName; - } - - @JsonProperty("targetRevision") - public Integer getTargetRevision() { - return targetRevision; - } - - @JsonProperty("targetRevision") - public void setTargetRevision(Integer targetRevision) { - this.targetRevision = targetRevision; - } - - @JsonIgnore - public KubeControllerManagerStatusNodeStatusesBuilder edit() { - return new KubeControllerManagerStatusNodeStatusesBuilder(this); - } - - @JsonIgnore - public KubeControllerManagerStatusNodeStatusesBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatus.java index b37a0cb7308..357a093cdfa 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatus.java @@ -65,17 +65,17 @@ public class KubeSchedulerStatus implements Editable @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("latestAvailableRevision") private Integer latestAvailableRevision; @JsonProperty("latestAvailableRevisionReason") private String latestAvailableRevisionReason; @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nodeStatuses = new ArrayList<>(); + private List nodeStatuses = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -92,7 +92,7 @@ public class KubeSchedulerStatus implements Editable public KubeSchedulerStatus() { } - public KubeSchedulerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { + public KubeSchedulerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; @@ -106,23 +106,23 @@ public KubeSchedulerStatus(List conditions, List< @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } @@ -148,12 +148,12 @@ public void setLatestAvailableRevisionReason(String latestAvailableRevisionReaso @JsonProperty("nodeStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNodeStatuses() { + public List getNodeStatuses() { return nodeStatuses; } @JsonProperty("nodeStatuses") - public void setNodeStatuses(List nodeStatuses) { + public void setNodeStatuses(List nodeStatuses) { this.nodeStatuses = nodeStatuses; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusConditions.java deleted file mode 100644 index eca2b164d27..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeSchedulerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchedulerStatusConditions() { - } - - public KubeSchedulerStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public KubeSchedulerStatusConditionsBuilder edit() { - return new KubeSchedulerStatusConditionsBuilder(this); - } - - @JsonIgnore - public KubeSchedulerStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusGenerations.java deleted file mode 100644 index 78eb4ebca65..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeSchedulerStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchedulerStatusGenerations() { - } - - public KubeSchedulerStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public KubeSchedulerStatusGenerationsBuilder edit() { - return new KubeSchedulerStatusGenerationsBuilder(this); - } - - @JsonIgnore - public KubeSchedulerStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusNodeStatuses.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusNodeStatuses.java deleted file mode 100644 index d9f5dfbf05e..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeSchedulerStatusNodeStatuses.java +++ /dev/null @@ -1,224 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "currentRevision", - "lastFailedCount", - "lastFailedReason", - "lastFailedRevision", - "lastFailedRevisionErrors", - "lastFailedTime", - "lastFallbackCount", - "nodeName", - "targetRevision" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeSchedulerStatusNodeStatuses implements Editable , KubernetesResource -{ - - @JsonProperty("currentRevision") - private Integer currentRevision; - @JsonProperty("lastFailedCount") - private Integer lastFailedCount; - @JsonProperty("lastFailedReason") - private String lastFailedReason; - @JsonProperty("lastFailedRevision") - private Integer lastFailedRevision; - @JsonProperty("lastFailedRevisionErrors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List lastFailedRevisionErrors = new ArrayList<>(); - @JsonProperty("lastFailedTime") - private String lastFailedTime; - @JsonProperty("lastFallbackCount") - private Integer lastFallbackCount; - @JsonProperty("nodeName") - private String nodeName; - @JsonProperty("targetRevision") - private Integer targetRevision; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchedulerStatusNodeStatuses() { - } - - public KubeSchedulerStatusNodeStatuses(Integer currentRevision, Integer lastFailedCount, String lastFailedReason, Integer lastFailedRevision, List lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, String nodeName, Integer targetRevision) { - super(); - this.currentRevision = currentRevision; - this.lastFailedCount = lastFailedCount; - this.lastFailedReason = lastFailedReason; - this.lastFailedRevision = lastFailedRevision; - this.lastFailedRevisionErrors = lastFailedRevisionErrors; - this.lastFailedTime = lastFailedTime; - this.lastFallbackCount = lastFallbackCount; - this.nodeName = nodeName; - this.targetRevision = targetRevision; - } - - @JsonProperty("currentRevision") - public Integer getCurrentRevision() { - return currentRevision; - } - - @JsonProperty("currentRevision") - public void setCurrentRevision(Integer currentRevision) { - this.currentRevision = currentRevision; - } - - @JsonProperty("lastFailedCount") - public Integer getLastFailedCount() { - return lastFailedCount; - } - - @JsonProperty("lastFailedCount") - public void setLastFailedCount(Integer lastFailedCount) { - this.lastFailedCount = lastFailedCount; - } - - @JsonProperty("lastFailedReason") - public String getLastFailedReason() { - return lastFailedReason; - } - - @JsonProperty("lastFailedReason") - public void setLastFailedReason(String lastFailedReason) { - this.lastFailedReason = lastFailedReason; - } - - @JsonProperty("lastFailedRevision") - public Integer getLastFailedRevision() { - return lastFailedRevision; - } - - @JsonProperty("lastFailedRevision") - public void setLastFailedRevision(Integer lastFailedRevision) { - this.lastFailedRevision = lastFailedRevision; - } - - @JsonProperty("lastFailedRevisionErrors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLastFailedRevisionErrors() { - return lastFailedRevisionErrors; - } - - @JsonProperty("lastFailedRevisionErrors") - public void setLastFailedRevisionErrors(List lastFailedRevisionErrors) { - this.lastFailedRevisionErrors = lastFailedRevisionErrors; - } - - @JsonProperty("lastFailedTime") - public String getLastFailedTime() { - return lastFailedTime; - } - - @JsonProperty("lastFailedTime") - public void setLastFailedTime(String lastFailedTime) { - this.lastFailedTime = lastFailedTime; - } - - @JsonProperty("lastFallbackCount") - public Integer getLastFallbackCount() { - return lastFallbackCount; - } - - @JsonProperty("lastFallbackCount") - public void setLastFallbackCount(Integer lastFallbackCount) { - this.lastFallbackCount = lastFallbackCount; - } - - @JsonProperty("nodeName") - public String getNodeName() { - return nodeName; - } - - @JsonProperty("nodeName") - public void setNodeName(String nodeName) { - this.nodeName = nodeName; - } - - @JsonProperty("targetRevision") - public Integer getTargetRevision() { - return targetRevision; - } - - @JsonProperty("targetRevision") - public void setTargetRevision(Integer targetRevision) { - this.targetRevision = targetRevision; - } - - @JsonIgnore - public KubeSchedulerStatusNodeStatusesBuilder edit() { - return new KubeSchedulerStatusNodeStatusesBuilder(this); - } - - @JsonIgnore - public KubeSchedulerStatusNodeStatusesBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatus.java index 33fc76e0b36..81da6ab6cc1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatus.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "observedGeneration", "readyReplicas", "version" @@ -62,10 +63,12 @@ public class KubeStorageVersionMigratorStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class KubeStorageVersionMigratorStatus implements Editable conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public KubeStorageVersionMigratorStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public KubeStorageVersionMigratorStatus(List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatusConditions.java deleted file mode 100644 index 16e941cdc08..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeStorageVersionMigratorStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeStorageVersionMigratorStatusConditions() { - } - - public KubeStorageVersionMigratorStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public KubeStorageVersionMigratorStatusConditionsBuilder edit() { - return new KubeStorageVersionMigratorStatusConditionsBuilder(this); - } - - @JsonIgnore - public KubeStorageVersionMigratorStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatusGenerations.java deleted file mode 100644 index bc9c68638be..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigratorStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class KubeStorageVersionMigratorStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeStorageVersionMigratorStatusGenerations() { - } - - public KubeStorageVersionMigratorStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public KubeStorageVersionMigratorStatusGenerationsBuilder edit() { - return new KubeStorageVersionMigratorStatusGenerationsBuilder(this); - } - - @JsonIgnore - public KubeStorageVersionMigratorStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLoadBalancer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java similarity index 78% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLoadBalancer.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java index 5bcc2a8054a..6377c2bdfa0 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLoadBalancer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.operator.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -54,16 +56,16 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecEPSLoadBalancer implements Editable , KubernetesResource +public class LoadBalancerStrategy implements Editable , KubernetesResource { @JsonProperty("allowedSourceRanges") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object allowedSourceRanges; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List allowedSourceRanges = new ArrayList<>(); @JsonProperty("dnsManagementPolicy") private String dnsManagementPolicy; @JsonProperty("providerParameters") - private IngressControllerSpecEPSLBProviderParameters providerParameters; + private ProviderLoadBalancerParameters providerParameters; @JsonProperty("scope") private String scope; @JsonIgnore @@ -73,10 +75,10 @@ public class IngressControllerSpecEPSLoadBalancer implements Editable allowedSourceRanges, String dnsManagementPolicy, ProviderLoadBalancerParameters providerParameters, String scope) { super(); this.allowedSourceRanges = allowedSourceRanges; this.dnsManagementPolicy = dnsManagementPolicy; @@ -85,13 +87,13 @@ public IngressControllerSpecEPSLoadBalancer(Object allowedSourceRanges, String d } @JsonProperty("allowedSourceRanges") - public Object getAllowedSourceRanges() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAllowedSourceRanges() { return allowedSourceRanges; } @JsonProperty("allowedSourceRanges") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setAllowedSourceRanges(Object allowedSourceRanges) { + public void setAllowedSourceRanges(List allowedSourceRanges) { this.allowedSourceRanges = allowedSourceRanges; } @@ -106,12 +108,12 @@ public void setDnsManagementPolicy(String dnsManagementPolicy) { } @JsonProperty("providerParameters") - public IngressControllerSpecEPSLBProviderParameters getProviderParameters() { + public ProviderLoadBalancerParameters getProviderParameters() { return providerParameters; } @JsonProperty("providerParameters") - public void setProviderParameters(IngressControllerSpecEPSLBProviderParameters providerParameters) { + public void setProviderParameters(ProviderLoadBalancerParameters providerParameters) { this.providerParameters = providerParameters; } @@ -126,12 +128,12 @@ public void setScope(String scope) { } @JsonIgnore - public IngressControllerSpecEPSLoadBalancerBuilder edit() { - return new IngressControllerSpecEPSLoadBalancerBuilder(this); + public LoadBalancerStrategyBuilder edit() { + return new LoadBalancerStrategyBuilder(this); } @JsonIgnore - public IngressControllerSpecEPSLoadBalancerBuilder toBuilder() { + public LoadBalancerStrategyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADestination.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoggingDestination.java similarity index 80% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADestination.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoggingDestination.java index 4f70df8c583..ab1d947b68a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADestination.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoggingDestination.java @@ -53,13 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecLADestination implements Editable , KubernetesResource +public class LoggingDestination implements Editable , KubernetesResource { @JsonProperty("container") - private IngressControllerSpecLADContainer container; + private ContainerLoggingDestinationParameters container; @JsonProperty("syslog") - private IngressControllerSpecLADSyslog syslog; + private SyslogLoggingDestinationParameters syslog; @JsonProperty("type") private String type; @JsonIgnore @@ -69,10 +69,10 @@ public class IngressControllerSpecLADestination implements Editable , KubernetesResource +public class MTUMigration implements Editable , KubernetesResource { @JsonProperty("machine") - private NetworkSpecMMMachine machine; + private MTUMigrationValues machine; @JsonProperty("network") - private NetworkSpecMMNetwork network; + private MTUMigrationValues network; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class NetworkSpecMMtu implements Editable , Kuber * No args constructor for use in serialization * */ - public NetworkSpecMMtu() { + public MTUMigration() { } - public NetworkSpecMMtu(NetworkSpecMMMachine machine, NetworkSpecMMNetwork network) { + public MTUMigration(MTUMigrationValues machine, MTUMigrationValues network) { super(); this.machine = machine; this.network = network; } @JsonProperty("machine") - public NetworkSpecMMMachine getMachine() { + public MTUMigrationValues getMachine() { return machine; } @JsonProperty("machine") - public void setMachine(NetworkSpecMMMachine machine) { + public void setMachine(MTUMigrationValues machine) { this.machine = machine; } @JsonProperty("network") - public NetworkSpecMMNetwork getNetwork() { + public MTUMigrationValues getNetwork() { return network; } @JsonProperty("network") - public void setNetwork(NetworkSpecMMNetwork network) { + public void setNetwork(MTUMigrationValues network) { this.network = network; } @JsonIgnore - public NetworkSpecMMtuBuilder edit() { - return new NetworkSpecMMtuBuilder(this); + public MTUMigrationBuilder edit() { + return new MTUMigrationBuilder(this); } @JsonIgnore - public NetworkSpecMMtuBuilder toBuilder() { + public MTUMigrationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMMMachine.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMMMachine.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java index 621646e768d..f8c844570d3 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMMMachine.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecMMMachine implements Editable , KubernetesResource +public class MTUMigrationValues implements Editable , KubernetesResource { @JsonProperty("from") - private Integer from; + private Long from; @JsonProperty("to") - private Integer to; + private Long to; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class NetworkSpecMMMachine implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); + @JsonProperty("nodeDisruptionPolicyStatus") + private NodeDisruptionPolicyStatus nodeDisruptionPolicyStatus; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonIgnore @@ -72,23 +76,34 @@ public class MachineConfigurationStatus implements Editable conditions, Long observedGeneration) { + public MachineConfigurationStatus(List conditions, NodeDisruptionPolicyStatus nodeDisruptionPolicyStatus, Long observedGeneration) { super(); this.conditions = conditions; + this.nodeDisruptionPolicyStatus = nodeDisruptionPolicyStatus; this.observedGeneration = observedGeneration; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } + @JsonProperty("nodeDisruptionPolicyStatus") + public NodeDisruptionPolicyStatus getNodeDisruptionPolicyStatus() { + return nodeDisruptionPolicyStatus; + } + + @JsonProperty("nodeDisruptionPolicyStatus") + public void setNodeDisruptionPolicyStatus(NodeDisruptionPolicyStatus nodeDisruptionPolicyStatus) { + this.nodeDisruptionPolicyStatus = nodeDisruptionPolicyStatus; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTCTls.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MachineManager.java similarity index 69% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTCTls.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MachineManager.java index d41681a0357..050d81f2c2d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTCTls.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MachineManager.java @@ -31,8 +31,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "caBundle", - "serverName" + "apiGroup", + "resource", + "selection" }) @ToString @EqualsAndHashCode @@ -52,13 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecURTCTls implements Editable , KubernetesResource +public class MachineManager implements Editable , KubernetesResource { - @JsonProperty("caBundle") - private DNSSpecURTCTCaBundle caBundle; - @JsonProperty("serverName") - private String serverName; + @JsonProperty("apiGroup") + private String apiGroup; + @JsonProperty("resource") + private String resource; + @JsonProperty("selection") + private MachineManagerSelector selection; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +69,53 @@ public class DNSSpecURTCTls implements Editable , Kuberne * No args constructor for use in serialization * */ - public DNSSpecURTCTls() { + public MachineManager() { } - public DNSSpecURTCTls(DNSSpecURTCTCaBundle caBundle, String serverName) { + public MachineManager(String apiGroup, String resource, MachineManagerSelector selection) { super(); - this.caBundle = caBundle; - this.serverName = serverName; + this.apiGroup = apiGroup; + this.resource = resource; + this.selection = selection; } - @JsonProperty("caBundle") - public DNSSpecURTCTCaBundle getCaBundle() { - return caBundle; + @JsonProperty("apiGroup") + public String getApiGroup() { + return apiGroup; } - @JsonProperty("caBundle") - public void setCaBundle(DNSSpecURTCTCaBundle caBundle) { - this.caBundle = caBundle; + @JsonProperty("apiGroup") + public void setApiGroup(String apiGroup) { + this.apiGroup = apiGroup; } - @JsonProperty("serverName") - public String getServerName() { - return serverName; + @JsonProperty("resource") + public String getResource() { + return resource; } - @JsonProperty("serverName") - public void setServerName(String serverName) { - this.serverName = serverName; + @JsonProperty("resource") + public void setResource(String resource) { + this.resource = resource; + } + + @JsonProperty("selection") + public MachineManagerSelector getSelection() { + return selection; + } + + @JsonProperty("selection") + public void setSelection(MachineManagerSelector selection) { + this.selection = selection; } @JsonIgnore - public DNSSpecURTCTlsBuilder edit() { - return new DNSSpecURTCTlsBuilder(this); + public MachineManagerBuilder edit() { + return new MachineManagerBuilder(this); } @JsonIgnore - public DNSSpecURTCTlsBuilder toBuilder() { + public MachineManagerBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MachineManagerSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MachineManagerSelector.java new file mode 100644 index 00000000000..9a008578b8b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MachineManagerSelector.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "mode", + "partial" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class MachineManagerSelector implements Editable , KubernetesResource +{ + + @JsonProperty("mode") + private String mode; + @JsonProperty("partial") + private PartialSelector partial; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineManagerSelector() { + } + + public MachineManagerSelector(String mode, PartialSelector partial) { + super(); + this.mode = mode; + this.partial = partial; + } + + @JsonProperty("mode") + public String getMode() { + return mode; + } + + @JsonProperty("mode") + public void setMode(String mode) { + this.mode = mode; + } + + @JsonProperty("partial") + public PartialSelector getPartial() { + return partial; + } + + @JsonProperty("partial") + public void setPartial(PartialSelector partial) { + this.partial = partial; + } + + @JsonIgnore + public MachineManagerSelectorBuilder edit() { + return new MachineManagerSelectorBuilder(this); + } + + @JsonIgnore + public MachineManagerSelectorBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ManagedBootImages.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ManagedBootImages.java new file mode 100644 index 00000000000..fc8173fdc0a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ManagedBootImages.java @@ -0,0 +1,112 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "machineManagers" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ManagedBootImages implements Editable , KubernetesResource +{ + + @JsonProperty("machineManagers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List machineManagers = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ManagedBootImages() { + } + + public ManagedBootImages(List machineManagers) { + super(); + this.machineManagers = machineManagers; + } + + @JsonProperty("machineManagers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMachineManagers() { + return machineManagers; + } + + @JsonProperty("machineManagers") + public void setMachineManagers(List machineManagers) { + this.machineManagers = machineManagers; + } + + @JsonIgnore + public ManagedBootImagesBuilder edit() { + return new ManagedBootImagesBuilder(this); + } + + @JsonIgnore + public ManagedBootImagesBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MyOperatorResource.java similarity index 53% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MyOperatorResource.java index 9bfbac0135e..07d46a76a3d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MyOperatorResource.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; @@ -31,11 +36,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" + "apiVersion", + "kind", + "metadata", + "spec", + "status" }) @ToString @EqualsAndHashCode @@ -54,20 +59,35 @@ @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("operator.openshift.io") @Generated("jsonschema2pojo") -public class AuthenticationStatusConditions implements Editable , KubernetesResource +public class MyOperatorResource implements Editable , HasMetadata, Namespaced { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "MyOperatorResource"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private MyOperatorResourceSpec spec; @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + private MyOperatorResourceStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,75 +95,95 @@ public class AuthenticationStatusConditions implements Editable , KubernetesResource +public class MyOperatorResourceSpec implements Editable , KubernetesResource { - @JsonProperty("latency") + @JsonProperty("logLevel") + private String logLevel; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("observedConfig") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object latency; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("success") - private Boolean success; - @JsonProperty("time") + private Object observedConfig; + @JsonProperty("operatorLogLevel") + private String operatorLogLevel; + @JsonProperty("unsupportedConfigOverrides") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object time; + private Object unsupportedConfigOverrides; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,77 +77,77 @@ public class PodNetworkConnectivityCheckStatusOEndLogs implements Editable , KubernetesResource +public class MyOperatorResourceStatus implements Editable , KubernetesResource { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("version") + private String version; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -78,37 +82,49 @@ public class MachineConfigurationStatusConditions implements Editable conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; + this.conditions = conditions; + this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; - this.reason = reason; - this.status = status; - this.type = type; + this.readyReplicas = readyReplicas; + this.version = version; } - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; } - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; } - @JsonProperty("message") - public String getMessage() { - return message; + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGenerations() { + return generations; } - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; + } + + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; } @JsonProperty("observedGeneration") @@ -121,43 +137,33 @@ public void setObservedGeneration(Long observedGeneration) { this.observedGeneration = observedGeneration; } - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; } - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; } - @JsonProperty("type") - public String getType() { - return type; + @JsonProperty("version") + public String getVersion() { + return version; } - @JsonProperty("type") - public void setType(String type) { - this.type = type; + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; } @JsonIgnore - public MachineConfigurationStatusConditionsBuilder edit() { - return new MachineConfigurationStatusConditionsBuilder(this); + public MyOperatorResourceStatusBuilder edit() { + return new MyOperatorResourceStatusBuilder(this); } @JsonIgnore - public MachineConfigurationStatusConditionsBuilder toBuilder() { + public MyOperatorResourceStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecENFSFlow.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetFlowConfig.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecENFSFlow.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetFlowConfig.java index 4c06dbb6802..ce2ea395707 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecENFSFlow.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetFlowConfig.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecENFSFlow implements Editable , KubernetesResource +public class NetFlowConfig implements Editable , KubernetesResource { @JsonProperty("collectors") @@ -66,10 +66,10 @@ public class NetworkSpecENFSFlow implements Editable * No args constructor for use in serialization * */ - public NetworkSpecENFSFlow() { + public NetFlowConfig() { } - public NetworkSpecENFSFlow(List collectors) { + public NetFlowConfig(List collectors) { super(); this.collectors = collectors; } @@ -86,12 +86,12 @@ public void setCollectors(List collectors) { } @JsonIgnore - public NetworkSpecENFSFlowBuilder edit() { - return new NetworkSpecENFSFlowBuilder(this); + public NetFlowConfigBuilder edit() { + return new NetFlowConfigBuilder(this); } @JsonIgnore - public NetworkSpecENFSFlowBuilder toBuilder() { + public NetFlowConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMigration.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMigration.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java index 8b0c2ed0406..4781688ed8d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMigration.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java @@ -54,15 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecMigration implements Editable , KubernetesResource +public class NetworkMigration implements Editable , KubernetesResource { @JsonProperty("features") - private NetworkSpecMFeatures features; + private FeaturesMigration features; @JsonProperty("mode") private String mode; @JsonProperty("mtu") - private NetworkSpecMMtu mtu; + private MTUMigration mtu; @JsonProperty("networkType") private String networkType; @JsonIgnore @@ -72,10 +72,10 @@ public class NetworkSpecMigration implements Editable , KubernetesRes @JsonProperty("additionalNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List additionalNetworks = new ArrayList<>(); + private List additionalNetworks = new ArrayList<>(); + @JsonProperty("additionalRoutingCapabilities") + private AdditionalRoutingCapabilities additionalRoutingCapabilities; @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List clusterNetwork = new ArrayList<>(); + private List clusterNetwork = new ArrayList<>(); @JsonProperty("defaultNetwork") - private NetworkSpecDefaultNetwork defaultNetwork; + private DefaultNetworkDefinition defaultNetwork; @JsonProperty("deployKubeProxy") private Boolean deployKubeProxy; @JsonProperty("disableMultiNetwork") @@ -86,15 +89,15 @@ public class NetworkSpec implements Editable , KubernetesRes @JsonProperty("disableNetworkDiagnostics") private Boolean disableNetworkDiagnostics; @JsonProperty("exportNetworkFlows") - private NetworkSpecExportNetworkFlows exportNetworkFlows; + private ExportNetworkFlows exportNetworkFlows; @JsonProperty("kubeProxyConfig") - private NetworkSpecKubeProxyConfig kubeProxyConfig; + private ProxyConfig kubeProxyConfig; @JsonProperty("logLevel") private String logLevel; @JsonProperty("managementState") private String managementState; @JsonProperty("migration") - private NetworkSpecMigration migration; + private NetworkMigration migration; @JsonProperty("observedConfig") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) private Object observedConfig; @@ -118,9 +121,10 @@ public class NetworkSpec implements Editable , KubernetesRes public NetworkSpec() { } - public NetworkSpec(List additionalNetworks, List clusterNetwork, NetworkSpecDefaultNetwork defaultNetwork, Boolean deployKubeProxy, Boolean disableMultiNetwork, Boolean disableNetworkDiagnostics, NetworkSpecExportNetworkFlows exportNetworkFlows, NetworkSpecKubeProxyConfig kubeProxyConfig, String logLevel, String managementState, NetworkSpecMigration migration, Object observedConfig, String operatorLogLevel, List serviceNetwork, Object unsupportedConfigOverrides, Boolean useMultiNetworkPolicy) { + public NetworkSpec(List additionalNetworks, AdditionalRoutingCapabilities additionalRoutingCapabilities, List clusterNetwork, DefaultNetworkDefinition defaultNetwork, Boolean deployKubeProxy, Boolean disableMultiNetwork, Boolean disableNetworkDiagnostics, ExportNetworkFlows exportNetworkFlows, ProxyConfig kubeProxyConfig, String logLevel, String managementState, NetworkMigration migration, Object observedConfig, String operatorLogLevel, List serviceNetwork, Object unsupportedConfigOverrides, Boolean useMultiNetworkPolicy) { super(); this.additionalNetworks = additionalNetworks; + this.additionalRoutingCapabilities = additionalRoutingCapabilities; this.clusterNetwork = clusterNetwork; this.defaultNetwork = defaultNetwork; this.deployKubeProxy = deployKubeProxy; @@ -140,33 +144,43 @@ public NetworkSpec(List additionalNetworks, List< @JsonProperty("additionalNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAdditionalNetworks() { + public List getAdditionalNetworks() { return additionalNetworks; } @JsonProperty("additionalNetworks") - public void setAdditionalNetworks(List additionalNetworks) { + public void setAdditionalNetworks(List additionalNetworks) { this.additionalNetworks = additionalNetworks; } + @JsonProperty("additionalRoutingCapabilities") + public AdditionalRoutingCapabilities getAdditionalRoutingCapabilities() { + return additionalRoutingCapabilities; + } + + @JsonProperty("additionalRoutingCapabilities") + public void setAdditionalRoutingCapabilities(AdditionalRoutingCapabilities additionalRoutingCapabilities) { + this.additionalRoutingCapabilities = additionalRoutingCapabilities; + } + @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClusterNetwork() { + public List getClusterNetwork() { return clusterNetwork; } @JsonProperty("clusterNetwork") - public void setClusterNetwork(List clusterNetwork) { + public void setClusterNetwork(List clusterNetwork) { this.clusterNetwork = clusterNetwork; } @JsonProperty("defaultNetwork") - public NetworkSpecDefaultNetwork getDefaultNetwork() { + public DefaultNetworkDefinition getDefaultNetwork() { return defaultNetwork; } @JsonProperty("defaultNetwork") - public void setDefaultNetwork(NetworkSpecDefaultNetwork defaultNetwork) { + public void setDefaultNetwork(DefaultNetworkDefinition defaultNetwork) { this.defaultNetwork = defaultNetwork; } @@ -201,22 +215,22 @@ public void setDisableNetworkDiagnostics(Boolean disableNetworkDiagnostics) { } @JsonProperty("exportNetworkFlows") - public NetworkSpecExportNetworkFlows getExportNetworkFlows() { + public ExportNetworkFlows getExportNetworkFlows() { return exportNetworkFlows; } @JsonProperty("exportNetworkFlows") - public void setExportNetworkFlows(NetworkSpecExportNetworkFlows exportNetworkFlows) { + public void setExportNetworkFlows(ExportNetworkFlows exportNetworkFlows) { this.exportNetworkFlows = exportNetworkFlows; } @JsonProperty("kubeProxyConfig") - public NetworkSpecKubeProxyConfig getKubeProxyConfig() { + public ProxyConfig getKubeProxyConfig() { return kubeProxyConfig; } @JsonProperty("kubeProxyConfig") - public void setKubeProxyConfig(NetworkSpecKubeProxyConfig kubeProxyConfig) { + public void setKubeProxyConfig(ProxyConfig kubeProxyConfig) { this.kubeProxyConfig = kubeProxyConfig; } @@ -241,12 +255,12 @@ public void setManagementState(String managementState) { } @JsonProperty("migration") - public NetworkSpecMigration getMigration() { + public NetworkMigration getMigration() { return migration; } @JsonProperty("migration") - public void setMigration(NetworkSpecMigration migration) { + public void setMigration(NetworkMigration migration) { this.migration = migration; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCHOCHybridClusterNetwork.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCHOCHybridClusterNetwork.java deleted file mode 100644 index e4f915b73d1..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOKCHOCHybridClusterNetwork.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "cidr", - "hostPrefix" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class NetworkSpecDNOKCHOCHybridClusterNetwork implements Editable , KubernetesResource -{ - - @JsonProperty("cidr") - private String cidr; - @JsonProperty("hostPrefix") - private Integer hostPrefix; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkSpecDNOKCHOCHybridClusterNetwork() { - } - - public NetworkSpecDNOKCHOCHybridClusterNetwork(String cidr, Integer hostPrefix) { - super(); - this.cidr = cidr; - this.hostPrefix = hostPrefix; - } - - @JsonProperty("cidr") - public String getCidr() { - return cidr; - } - - @JsonProperty("cidr") - public void setCidr(String cidr) { - this.cidr = cidr; - } - - @JsonProperty("hostPrefix") - public Integer getHostPrefix() { - return hostPrefix; - } - - @JsonProperty("hostPrefix") - public void setHostPrefix(Integer hostPrefix) { - this.hostPrefix = hostPrefix; - } - - @JsonIgnore - public NetworkSpecDNOKCHOCHybridClusterNetworkBuilder edit() { - return new NetworkSpecDNOKCHOCHybridClusterNetworkBuilder(this); - } - - @JsonIgnore - public NetworkSpecDNOKCHOCHybridClusterNetworkBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatus.java index 8896668a8c5..5928ef78d64 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatus.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "observedGeneration", "readyReplicas", "version" @@ -62,10 +63,12 @@ public class NetworkStatus implements Editable , Kubernete @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class NetworkStatus implements Editable , Kubernete public NetworkStatus() { } - public NetworkStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public NetworkStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public NetworkStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatusConditions.java deleted file mode 100644 index d0114e69294..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class NetworkStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkStatusConditions() { - } - - public NetworkStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public NetworkStatusConditionsBuilder edit() { - return new NetworkStatusConditionsBuilder(this); - } - - @JsonIgnore - public NetworkStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatusGenerations.java deleted file mode 100644 index be4626f74bd..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class NetworkStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkStatusGenerations() { - } - - public NetworkStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public NetworkStatusGenerationsBuilder edit() { - return new NetworkStatusGenerationsBuilder(this); - } - - @JsonIgnore - public NetworkStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyClusterStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyClusterStatus.java new file mode 100644 index 00000000000..4257da8b4c4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyClusterStatus.java @@ -0,0 +1,142 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "files", + "sshkey", + "units" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NodeDisruptionPolicyClusterStatus implements Editable , KubernetesResource +{ + + @JsonProperty("files") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List files = new ArrayList<>(); + @JsonProperty("sshkey") + private NodeDisruptionPolicyStatusSSHKey sshkey; + @JsonProperty("units") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List units = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicyClusterStatus() { + } + + public NodeDisruptionPolicyClusterStatus(List files, NodeDisruptionPolicyStatusSSHKey sshkey, List units) { + super(); + this.files = files; + this.sshkey = sshkey; + this.units = units; + } + + @JsonProperty("files") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getFiles() { + return files; + } + + @JsonProperty("files") + public void setFiles(List files) { + this.files = files; + } + + @JsonProperty("sshkey") + public NodeDisruptionPolicyStatusSSHKey getSshkey() { + return sshkey; + } + + @JsonProperty("sshkey") + public void setSshkey(NodeDisruptionPolicyStatusSSHKey sshkey) { + this.sshkey = sshkey; + } + + @JsonProperty("units") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUnits() { + return units; + } + + @JsonProperty("units") + public void setUnits(List units) { + this.units = units; + } + + @JsonIgnore + public NodeDisruptionPolicyClusterStatusBuilder edit() { + return new NodeDisruptionPolicyClusterStatusBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicyClusterStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNPNodeSelector.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyConfig.java similarity index 66% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNPNodeSelector.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyConfig.java index 02fc4be37b5..468c5eac8d2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNPNodeSelector.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyConfig.java @@ -18,7 +18,6 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LabelSelectorRequirement; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -34,8 +33,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "matchExpressions", - "matchLabels" + "files", + "sshkey", + "units" }) @ToString @EqualsAndHashCode @@ -55,15 +55,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecNPNodeSelector implements Editable , KubernetesResource +public class NodeDisruptionPolicyConfig implements Editable , KubernetesResource { - @JsonProperty("matchExpressions") + @JsonProperty("files") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") + private List files = new ArrayList<>(); + @JsonProperty("sshkey") + private NodeDisruptionPolicySpecSSHKey sshkey; + @JsonProperty("units") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); + private List units = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -71,44 +73,55 @@ public class IngressControllerSpecNPNodeSelector implements Editable matchExpressions, Map matchLabels) { + public NodeDisruptionPolicyConfig(List files, NodeDisruptionPolicySpecSSHKey sshkey, List units) { super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; + this.files = files; + this.sshkey = sshkey; + this.units = units; } - @JsonProperty("matchExpressions") + @JsonProperty("files") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; + public List getFiles() { + return files; } - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; + @JsonProperty("files") + public void setFiles(List files) { + this.files = files; } - @JsonProperty("matchLabels") + @JsonProperty("sshkey") + public NodeDisruptionPolicySpecSSHKey getSshkey() { + return sshkey; + } + + @JsonProperty("sshkey") + public void setSshkey(NodeDisruptionPolicySpecSSHKey sshkey) { + this.sshkey = sshkey; + } + + @JsonProperty("units") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; + public List getUnits() { + return units; } - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; + @JsonProperty("units") + public void setUnits(List units) { + this.units = units; } @JsonIgnore - public IngressControllerSpecNPNodeSelectorBuilder edit() { - return new IngressControllerSpecNPNodeSelectorBuilder(this); + public NodeDisruptionPolicyConfigBuilder edit() { + return new NodeDisruptionPolicyConfigBuilder(this); } @JsonIgnore - public IngressControllerSpecNPNodeSelectorBuilder toBuilder() { + public NodeDisruptionPolicyConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARAction.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecAction.java similarity index 74% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARAction.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecAction.java index 59ab3c8d4ca..9618aeac582 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHARAction.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecAction.java @@ -31,7 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "set", + "reload", + "restart", "type" }) @ToString @@ -52,11 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecHHARAction implements Editable , KubernetesResource +public class NodeDisruptionPolicySpecAction implements Editable , KubernetesResource { - @JsonProperty("set") - private IngressControllerSpecHHARASet set; + @JsonProperty("reload") + private ReloadService reload; + @JsonProperty("restart") + private RestartService restart; @JsonProperty("type") private String type; @JsonIgnore @@ -66,23 +69,34 @@ public class IngressControllerSpecHHARAction implements Editable , KubernetesResource +{ + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List actions = new ArrayList<>(); + @JsonProperty("path") + private String path; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicySpecFile() { + } + + public NodeDisruptionPolicySpecFile(List actions, String path) { + super(); + this.actions = actions; + this.path = path; + } + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(List actions) { + this.actions = actions; + } + + @JsonProperty("path") + public String getPath() { + return path; + } + + @JsonProperty("path") + public void setPath(String path) { + this.path = path; + } + + @JsonIgnore + public NodeDisruptionPolicySpecFileBuilder edit() { + return new NodeDisruptionPolicySpecFileBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicySpecFileBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecSSHKey.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecSSHKey.java new file mode 100644 index 00000000000..6a7102110e4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecSSHKey.java @@ -0,0 +1,112 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "actions" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NodeDisruptionPolicySpecSSHKey implements Editable , KubernetesResource +{ + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List actions = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicySpecSSHKey() { + } + + public NodeDisruptionPolicySpecSSHKey(List actions) { + super(); + this.actions = actions; + } + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(List actions) { + this.actions = actions; + } + + @JsonIgnore + public NodeDisruptionPolicySpecSSHKeyBuilder edit() { + return new NodeDisruptionPolicySpecSSHKeyBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicySpecSSHKeyBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHAResponse.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecUnit.java similarity index 76% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHAResponse.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecUnit.java index 0e6b0d6b6d9..ceabd790d6b 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecHHAResponse.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicySpecUnit.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.operator.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -31,7 +33,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "action", + "actions", "name" }) @ToString @@ -52,11 +54,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecHHAResponse implements Editable , KubernetesResource +public class NodeDisruptionPolicySpecUnit implements Editable , KubernetesResource { - @JsonProperty("action") - private IngressControllerSpecHHARAction_1 action; + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List actions = new ArrayList<>(); @JsonProperty("name") private String name; @JsonIgnore @@ -66,23 +69,24 @@ public class IngressControllerSpecHHAResponse implements Editable actions, String name) { super(); - this.action = action; + this.actions = actions; this.name = name; } - @JsonProperty("action") - public IngressControllerSpecHHARAction_1 getAction() { - return action; + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getActions() { + return actions; } - @JsonProperty("action") - public void setAction(IngressControllerSpecHHARAction_1 action) { - this.action = action; + @JsonProperty("actions") + public void setActions(List actions) { + this.actions = actions; } @JsonProperty("name") @@ -96,12 +100,12 @@ public void setName(String name) { } @JsonIgnore - public IngressControllerSpecHHAResponseBuilder edit() { - return new IngressControllerSpecHHAResponseBuilder(this); + public NodeDisruptionPolicySpecUnitBuilder edit() { + return new NodeDisruptionPolicySpecUnitBuilder(this); } @JsonIgnore - public IngressControllerSpecHHAResponseBuilder toBuilder() { + public NodeDisruptionPolicySpecUnitBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatus.java new file mode 100644 index 00000000000..223df83881f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatus.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "clusterPolicies" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NodeDisruptionPolicyStatus implements Editable , KubernetesResource +{ + + @JsonProperty("clusterPolicies") + private NodeDisruptionPolicyClusterStatus clusterPolicies; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicyStatus() { + } + + public NodeDisruptionPolicyStatus(NodeDisruptionPolicyClusterStatus clusterPolicies) { + super(); + this.clusterPolicies = clusterPolicies; + } + + @JsonProperty("clusterPolicies") + public NodeDisruptionPolicyClusterStatus getClusterPolicies() { + return clusterPolicies; + } + + @JsonProperty("clusterPolicies") + public void setClusterPolicies(NodeDisruptionPolicyClusterStatus clusterPolicies) { + this.clusterPolicies = clusterPolicies; + } + + @JsonIgnore + public NodeDisruptionPolicyStatusBuilder edit() { + return new NodeDisruptionPolicyStatusBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicyStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusAction.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusAction.java new file mode 100644 index 00000000000..5ea1aaeaf46 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusAction.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "reload", + "restart", + "type" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NodeDisruptionPolicyStatusAction implements Editable , KubernetesResource +{ + + @JsonProperty("reload") + private ReloadService reload; + @JsonProperty("restart") + private RestartService restart; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicyStatusAction() { + } + + public NodeDisruptionPolicyStatusAction(ReloadService reload, RestartService restart, String type) { + super(); + this.reload = reload; + this.restart = restart; + this.type = type; + } + + @JsonProperty("reload") + public ReloadService getReload() { + return reload; + } + + @JsonProperty("reload") + public void setReload(ReloadService reload) { + this.reload = reload; + } + + @JsonProperty("restart") + public RestartService getRestart() { + return restart; + } + + @JsonProperty("restart") + public void setRestart(RestartService restart) { + this.restart = restart; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public NodeDisruptionPolicyStatusActionBuilder edit() { + return new NodeDisruptionPolicyStatusActionBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicyStatusActionBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusFile.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusFile.java new file mode 100644 index 00000000000..56e84af1409 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusFile.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "actions", + "path" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NodeDisruptionPolicyStatusFile implements Editable , KubernetesResource +{ + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List actions = new ArrayList<>(); + @JsonProperty("path") + private String path; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicyStatusFile() { + } + + public NodeDisruptionPolicyStatusFile(List actions, String path) { + super(); + this.actions = actions; + this.path = path; + } + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(List actions) { + this.actions = actions; + } + + @JsonProperty("path") + public String getPath() { + return path; + } + + @JsonProperty("path") + public void setPath(String path) { + this.path = path; + } + + @JsonIgnore + public NodeDisruptionPolicyStatusFileBuilder edit() { + return new NodeDisruptionPolicyStatusFileBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicyStatusFileBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusSSHKey.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusSSHKey.java new file mode 100644 index 00000000000..303052c7ff6 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusSSHKey.java @@ -0,0 +1,112 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "actions" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NodeDisruptionPolicyStatusSSHKey implements Editable , KubernetesResource +{ + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List actions = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicyStatusSSHKey() { + } + + public NodeDisruptionPolicyStatusSSHKey(List actions) { + super(); + this.actions = actions; + } + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(List actions) { + this.actions = actions; + } + + @JsonIgnore + public NodeDisruptionPolicyStatusSSHKeyBuilder edit() { + return new NodeDisruptionPolicyStatusSSHKeyBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicyStatusSSHKeyBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusUnit.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusUnit.java new file mode 100644 index 00000000000..3b507156df7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeDisruptionPolicyStatusUnit.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "actions", + "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 NodeDisruptionPolicyStatusUnit implements Editable , KubernetesResource +{ + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List actions = new ArrayList<>(); + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NodeDisruptionPolicyStatusUnit() { + } + + public NodeDisruptionPolicyStatusUnit(List actions, String name) { + super(); + this.actions = actions; + this.name = name; + } + + @JsonProperty("actions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(List actions) { + this.actions = actions; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public NodeDisruptionPolicyStatusUnitBuilder edit() { + return new NodeDisruptionPolicyStatusUnitBuilder(this); + } + + @JsonIgnore + public NodeDisruptionPolicyStatusUnitBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNodePlacement.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodePlacement.java similarity index 78% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNodePlacement.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodePlacement.java index 6d85925fa36..3c96f1ebc74 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecNodePlacement.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodePlacement.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.api.model.Toleration; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -54,14 +55,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecNodePlacement implements Editable , KubernetesResource +public class NodePlacement implements Editable , KubernetesResource { @JsonProperty("nodeSelector") - private IngressControllerSpecNPNodeSelector nodeSelector; + private LabelSelector nodeSelector; @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,43 +70,43 @@ public class IngressControllerSpecNodePlacement implements Editable tolerations) { + public NodePlacement(LabelSelector nodeSelector, List tolerations) { super(); this.nodeSelector = nodeSelector; this.tolerations = tolerations; } @JsonProperty("nodeSelector") - public IngressControllerSpecNPNodeSelector getNodeSelector() { + public LabelSelector getNodeSelector() { return nodeSelector; } @JsonProperty("nodeSelector") - public void setNodeSelector(IngressControllerSpecNPNodeSelector nodeSelector) { + public void setNodeSelector(LabelSelector nodeSelector) { this.nodeSelector = nodeSelector; } @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } @JsonIgnore - public IngressControllerSpecNodePlacementBuilder edit() { - return new IngressControllerSpecNodePlacementBuilder(this); + public NodePlacementBuilder edit() { + return new NodePlacementBuilder(this); } @JsonIgnore - public IngressControllerSpecNodePlacementBuilder toBuilder() { + public NodePlacementBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSPrivate.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodePortStrategy.java similarity index 88% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSPrivate.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodePortStrategy.java index 6a654b941c5..4917f5135c4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSPrivate.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodePortStrategy.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecEPSPrivate implements Editable , KubernetesResource +public class NodePortStrategy implements Editable , KubernetesResource { @JsonProperty("protocol") @@ -63,10 +63,10 @@ public class IngressControllerSpecEPSPrivate implements Editable , KubernetesResource +public class NodeStatus implements Editable , KubernetesResource { @JsonProperty("currentRevision") @@ -90,10 +90,10 @@ public class EtcdStatusNodeStatuses implements Editable lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, String nodeName, Integer targetRevision) { + public NodeStatus(Integer currentRevision, Integer lastFailedCount, String lastFailedReason, Integer lastFailedRevision, List lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, String nodeName, Integer targetRevision) { super(); this.currentRevision = currentRevision; this.lastFailedCount = lastFailedCount; @@ -198,12 +198,12 @@ public void setTargetRevision(Integer targetRevision) { } @JsonIgnore - public EtcdStatusNodeStatusesBuilder edit() { - return new EtcdStatusNodeStatusesBuilder(this); + public NodeStatusBuilder edit() { + return new NodeStatusBuilder(this); } @JsonIgnore - public EtcdStatusNodeStatusesBuilder toBuilder() { + public NodeStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusOauthAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OAuthAPIServerStatus.java similarity index 88% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusOauthAPIServer.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OAuthAPIServerStatus.java index ec35df1b32b..14b9a3d6ff6 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AuthenticationStatusOauthAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OAuthAPIServerStatus.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AuthenticationStatusOauthAPIServer implements Editable , KubernetesResource +public class OAuthAPIServerStatus implements Editable , KubernetesResource { @JsonProperty("latestAvailableRevision") @@ -63,10 +63,10 @@ public class AuthenticationStatusOauthAPIServer implements Editable , KubernetesResource +public class OVNKubernetesConfig implements Editable , KubernetesResource { @JsonProperty("egressIPConfig") - private NetworkSpecDNOKCEgressIPConfig egressIPConfig; + private EgressIPConfig egressIPConfig; @JsonProperty("gatewayConfig") - private NetworkSpecDNOKCGatewayConfig gatewayConfig; + private GatewayConfig gatewayConfig; @JsonProperty("genevePort") - private Integer genevePort; + private Long genevePort; @JsonProperty("hybridOverlayConfig") - private NetworkSpecDNOKCHybridOverlayConfig hybridOverlayConfig; + private HybridOverlayConfig hybridOverlayConfig; @JsonProperty("ipsecConfig") - private NetworkSpecDNOKCIpsecConfig ipsecConfig; + private IPsecConfig ipsecConfig; @JsonProperty("ipv4") - private NetworkSpecDNOKCIpv4 ipv4; + private IPv4OVNKubernetesConfig ipv4; @JsonProperty("ipv6") - private NetworkSpecDNOKCIpv6 ipv6; + private IPv6OVNKubernetesConfig ipv6; @JsonProperty("mtu") - private Integer mtu; + private Long mtu; @JsonProperty("policyAuditConfig") - private NetworkSpecDNOKCPolicyAuditConfig policyAuditConfig; + private PolicyAuditConfig policyAuditConfig; + @JsonProperty("routeAdvertisements") + private String routeAdvertisements; @JsonProperty("v4InternalSubnet") private String v4InternalSubnet; @JsonProperty("v6InternalSubnet") @@ -93,10 +96,10 @@ public class NetworkSpecDNOvnKubernetesConfig implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("latestAvailableRevision") private Integer latestAvailableRevision; @JsonProperty("observedGeneration") @@ -85,7 +85,7 @@ public class OpenShiftAPIServerStatus implements Editable conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { + public OpenShiftAPIServerStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; @@ -97,23 +97,23 @@ public OpenShiftAPIServerStatus(List conditi @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServerStatusConditions.java deleted file mode 100644 index 67a2b879df5..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServerStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class OpenShiftAPIServerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OpenShiftAPIServerStatusConditions() { - } - - public OpenShiftAPIServerStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public OpenShiftAPIServerStatusConditionsBuilder edit() { - return new OpenShiftAPIServerStatusConditionsBuilder(this); - } - - @JsonIgnore - public OpenShiftAPIServerStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServerStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServerStatusGenerations.java deleted file mode 100644 index a72da751263..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServerStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class OpenShiftAPIServerStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OpenShiftAPIServerStatusGenerations() { - } - - public OpenShiftAPIServerStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public OpenShiftAPIServerStatusGenerationsBuilder edit() { - return new OpenShiftAPIServerStatusGenerationsBuilder(this); - } - - @JsonIgnore - public OpenShiftAPIServerStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatus.java index 53d0d85037a..c3e89fa6b53 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatus.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "conditions", "generations", + "latestAvailableRevision", "observedGeneration", "readyReplicas", "version" @@ -62,10 +63,12 @@ public class OpenShiftControllerManagerStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class OpenShiftControllerManagerStatus implements Editable conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public OpenShiftControllerManagerStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public OpenShiftControllerManagerStatus(List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatusConditions.java deleted file mode 100644 index e0b31e60c84..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class OpenShiftControllerManagerStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OpenShiftControllerManagerStatusConditions() { - } - - public OpenShiftControllerManagerStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public OpenShiftControllerManagerStatusConditionsBuilder edit() { - return new OpenShiftControllerManagerStatusConditionsBuilder(this); - } - - @JsonIgnore - public OpenShiftControllerManagerStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatusGenerations.java deleted file mode 100644 index 8802952d500..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManagerStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class OpenShiftControllerManagerStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OpenShiftControllerManagerStatusGenerations() { - } - - public OpenShiftControllerManagerStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public OpenShiftControllerManagerStatusGenerationsBuilder edit() { - return new OpenShiftControllerManagerStatusGenerationsBuilder(this); - } - - @JsonIgnore - public OpenShiftControllerManagerStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOpenshiftSDNConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftSDNConfig.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOpenshiftSDNConfig.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftSDNConfig.java index 9a5f0a5bd78..a98e5edc5bb 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecDNOpenshiftSDNConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftSDNConfig.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecDNOpenshiftSDNConfig implements Editable , KubernetesResource +public class OpenShiftSDNConfig implements Editable , KubernetesResource { @JsonProperty("enableUnidling") @@ -63,11 +63,11 @@ public class NetworkSpecDNOpenshiftSDNConfig implements Editable additionalProperties = new LinkedHashMap(); @@ -75,10 +75,10 @@ public class NetworkSpecDNOpenshiftSDNConfig implements Editable , KubernetesResource +public class OperatorCondition implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class DNSStatusConditions implements Editable * No args constructor for use in serialization * */ - public DNSStatusConditions() { + public OperatorCondition() { } - public DNSStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { + public OperatorCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -138,12 +138,12 @@ public void setType(String type) { } @JsonIgnore - public DNSStatusConditionsBuilder edit() { - return new DNSStatusConditionsBuilder(this); + public OperatorConditionBuilder edit() { + return new OperatorConditionBuilder(this); } @JsonIgnore - public DNSStatusConditionsBuilder toBuilder() { + public OperatorConditionBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecTlsSecurityProfile.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorSpec.java similarity index 57% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecTlsSecurityProfile.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorSpec.java index db476d993a7..4e470f53da2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecTlsSecurityProfile.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorSpec.java @@ -31,11 +31,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "custom", - "intermediate", - "modern", - "old", - "type" + "logLevel", + "managementState", + "observedConfig", + "operatorLogLevel", + "unsupportedConfigOverrides" }) @ToString @EqualsAndHashCode @@ -55,23 +55,21 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecTlsSecurityProfile implements Editable , KubernetesResource +public class OperatorSpec implements Editable , KubernetesResource { - @JsonProperty("custom") + @JsonProperty("logLevel") + private String logLevel; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("observedConfig") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object custom; - @JsonProperty("intermediate") + private Object observedConfig; + @JsonProperty("operatorLogLevel") + private String operatorLogLevel; + @JsonProperty("unsupportedConfigOverrides") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object intermediate; - @JsonProperty("modern") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object modern; - @JsonProperty("old") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object old; - @JsonProperty("type") - private String type; + private Object unsupportedConfigOverrides; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -79,79 +77,77 @@ public class IngressControllerSpecTlsSecurityProfile implements Editable , KubernetesResource +public class OperatorStatus implements Editable , KubernetesResource { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("version") + private String version; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -78,37 +82,49 @@ public class InsightsOperatorStatusGSGConditions implements Editable conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; + this.conditions = conditions; + this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; - this.reason = reason; - this.status = status; - this.type = type; + this.readyReplicas = readyReplicas; + this.version = version; } - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; } - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; } - @JsonProperty("message") - public String getMessage() { - return message; + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGenerations() { + return generations; } - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; + } + + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; } @JsonProperty("observedGeneration") @@ -121,43 +137,33 @@ public void setObservedGeneration(Long observedGeneration) { this.observedGeneration = observedGeneration; } - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; } - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; } - @JsonProperty("type") - public String getType() { - return type; + @JsonProperty("version") + public String getVersion() { + return version; } - @JsonProperty("type") - public void setType(String type) { - this.type = type; + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; } @JsonIgnore - public InsightsOperatorStatusGSGConditionsBuilder edit() { - return new InsightsOperatorStatusGSGConditionsBuilder(this); + public OperatorStatusBuilder edit() { + return new OperatorStatusBuilder(this); } @JsonIgnore - public InsightsOperatorStatusGSGConditionsBuilder toBuilder() { + public OperatorStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPGcp.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PartialSelector.java similarity index 77% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPGcp.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PartialSelector.java index 3c0aa19b527..0b916006d27 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusEPSLBPPGcp.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PartialSelector.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "clientAccess" + "machineResourceSelector" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerStatusEPSLBPPGcp implements Editable , KubernetesResource +public class PartialSelector implements Editable , KubernetesResource { - @JsonProperty("clientAccess") - private String clientAccess; + @JsonProperty("machineResourceSelector") + private LabelSelector machineResourceSelector; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class IngressControllerStatusEPSLBPPGcp implements Editable , KubernetesResource +public class Perspective implements Editable , KubernetesResource { @JsonProperty("id") private String id; @JsonProperty("pinnedResources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List pinnedResources = new ArrayList<>(); + private List pinnedResources = new ArrayList<>(); @JsonProperty("visibility") - private ConsoleSpecCPVisibility visibility; + private PerspectiveVisibility visibility; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class ConsoleSpecCPerspectives implements Editable pinnedResources, ConsoleSpecCPVisibility visibility) { + public Perspective(String id, List pinnedResources, PerspectiveVisibility visibility) { super(); this.id = id; this.pinnedResources = pinnedResources; @@ -94,32 +94,32 @@ public void setId(String id) { @JsonProperty("pinnedResources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPinnedResources() { + public List getPinnedResources() { return pinnedResources; } @JsonProperty("pinnedResources") - public void setPinnedResources(List pinnedResources) { + public void setPinnedResources(List pinnedResources) { this.pinnedResources = pinnedResources; } @JsonProperty("visibility") - public ConsoleSpecCPVisibility getVisibility() { + public PerspectiveVisibility getVisibility() { return visibility; } @JsonProperty("visibility") - public void setVisibility(ConsoleSpecCPVisibility visibility) { + public void setVisibility(PerspectiveVisibility visibility) { this.visibility = visibility; } @JsonIgnore - public ConsoleSpecCPerspectivesBuilder edit() { - return new ConsoleSpecCPerspectivesBuilder(this); + public PerspectiveBuilder edit() { + return new PerspectiveBuilder(this); } @JsonIgnore - public ConsoleSpecCPerspectivesBuilder toBuilder() { + public PerspectiveBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCPVisibility.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCPVisibility.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java index 8090f294252..261272bc13d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCPVisibility.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCPVisibility implements Editable , KubernetesResource +public class PerspectiveVisibility implements Editable , KubernetesResource { @JsonProperty("accessReview") - private ConsoleSpecCPVAccessReview accessReview; + private ResourceAttributesAccessReview accessReview; @JsonProperty("state") private String state; @JsonIgnore @@ -66,22 +66,22 @@ public class ConsoleSpecCPVisibility implements Editable , KubernetesResource +public class PinnedResourceReference implements Editable , KubernetesResource { @JsonProperty("group") @@ -69,10 +69,10 @@ public class ConsoleSpecCPPinnedResources implements Editable , KubernetesResource +public class PolicyAuditConfig implements Editable , KubernetesResource { @JsonProperty("destination") private String destination; @JsonProperty("maxFileSize") - private Integer maxFileSize; + private Long maxFileSize; @JsonProperty("maxLogFiles") private Integer maxLogFiles; @JsonProperty("rateLimit") - private Integer rateLimit; + private Long rateLimit; @JsonProperty("syslogFacility") private String syslogFacility; @JsonIgnore @@ -75,10 +75,10 @@ public class NetworkSpecDNOKCPolicyAuditConfig implements Editable , KubernetesResource +public class PrivateStrategy implements Editable , KubernetesResource { @JsonProperty("protocol") @@ -63,10 +63,10 @@ public class IngressControllerSpecEPSNodePort implements Editable , KubernetesResource +public class ProjectAccess implements Editable , KubernetesResource { @JsonProperty("availableClusterRoles") @@ -66,10 +66,10 @@ public class ConsoleSpecCProjectAccess implements Editable availableClusterRoles) { + public ProjectAccess(List availableClusterRoles) { super(); this.availableClusterRoles = availableClusterRoles; } @@ -86,12 +86,12 @@ public void setAvailableClusterRoles(List availableClusterRoles) { } @JsonIgnore - public ConsoleSpecCProjectAccessBuilder edit() { - return new ConsoleSpecCProjectAccessBuilder(this); + public ProjectAccessBuilder edit() { + return new ProjectAccessBuilder(this); } @JsonIgnore - public ConsoleSpecCProjectAccessBuilder toBuilder() { + public ProjectAccessBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLBProviderParameters.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java similarity index 76% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLBProviderParameters.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java index 987c45a6c2c..98068e6429c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecEPSLBProviderParameters.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java @@ -54,15 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecEPSLBProviderParameters implements Editable , KubernetesResource +public class ProviderLoadBalancerParameters implements Editable , KubernetesResource { @JsonProperty("aws") - private IngressControllerSpecEPSLBPPAws aws; + private AWSLoadBalancerParameters aws; @JsonProperty("gcp") - private IngressControllerSpecEPSLBPPGcp gcp; + private GCPLoadBalancerParameters gcp; @JsonProperty("ibm") - private IngressControllerSpecEPSLBPPIbm ibm; + private IBMLoadBalancerParameters ibm; @JsonProperty("type") private String type; @JsonIgnore @@ -72,10 +72,10 @@ public class IngressControllerSpecEPSLBProviderParameters implements Editable , KubernetesResource +public class ProxyConfig implements Editable , KubernetesResource { @JsonProperty("bindAddress") @@ -71,10 +71,10 @@ public class NetworkSpecKubeProxyConfig implements Editable> proxyArguments) { + public ProxyConfig(String bindAddress, String iptablesSyncPeriod, Map> proxyArguments) { super(); this.bindAddress = bindAddress; this.iptablesSyncPeriod = iptablesSyncPeriod; @@ -113,12 +113,12 @@ public void setProxyArguments(Map> proxyArguments) { } @JsonIgnore - public NetworkSpecKubeProxyConfigBuilder edit() { - return new NetworkSpecKubeProxyConfigBuilder(this); + public ProxyConfigBuilder edit() { + return new ProxyConfigBuilder(this); } @JsonIgnore - public NetworkSpecKubeProxyConfigBuilder toBuilder() { + public ProxyConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCQuickStarts.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/QuickStarts.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCQuickStarts.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/QuickStarts.java index 540ddd75053..59158b78bf7 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecCQuickStarts.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/QuickStarts.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecCQuickStarts implements Editable , KubernetesResource +public class QuickStarts implements Editable , KubernetesResource { @JsonProperty("disabled") @@ -66,10 +66,10 @@ public class ConsoleSpecCQuickStarts implements Editable disabled) { + public QuickStarts(List disabled) { super(); this.disabled = disabled; } @@ -86,12 +86,12 @@ public void setDisabled(List disabled) { } @JsonIgnore - public ConsoleSpecCQuickStartsBuilder edit() { - return new ConsoleSpecCQuickStartsBuilder(this); + public QuickStartsBuilder edit() { + return new QuickStartsBuilder(this); } @JsonIgnore - public ConsoleSpecCQuickStartsBuilder toBuilder() { + public QuickStartsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTCTCaBundle.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ReloadService.java similarity index 82% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTCTCaBundle.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ReloadService.java index b22c5a1b98c..adf71c04455 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecURTCTCaBundle.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ReloadService.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "serviceName" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecURTCTCaBundle implements Editable , KubernetesResource +public class ReloadService implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("serviceName") + private String serviceName; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class DNSSpecURTCTCaBundle implements Editable , KubernetesResource +public class ResourceAttributesAccessReview implements Editable , KubernetesResource { @JsonProperty("missing") @@ -71,10 +71,10 @@ public class ConsoleSpecCPVAccessReview implements Editable missing, List required) { + public ResourceAttributesAccessReview(List missing, List required) { super(); this.missing = missing; this.required = required; @@ -103,12 +103,12 @@ public void setRequired(List required) { } @JsonIgnore - public ConsoleSpecCPVAccessReviewBuilder edit() { - return new ConsoleSpecCPVAccessReviewBuilder(this); + public ResourceAttributesAccessReviewBuilder edit() { + return new ResourceAttributesAccessReviewBuilder(this); } @JsonIgnore - public ConsoleSpecCPVAccessReviewBuilder toBuilder() { + public ResourceAttributesAccessReviewBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTCTCaBundle.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/RestartService.java similarity index 81% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTCTCaBundle.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/RestartService.java index f00e5db096d..4f23037d050 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecSFPTCTCaBundle.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/RestartService.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "serviceName" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecSFPTCTCaBundle implements Editable , KubernetesResource +public class RestartService implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("serviceName") + private String serviceName; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class DNSSpecSFPTCTCaBundle implements Editable , KubernetesResource +public class RouteAdmissionPolicy implements Editable , KubernetesResource { @JsonProperty("namespaceOwnership") @@ -66,10 +66,10 @@ public class IngressControllerSpecRouteAdmission implements Editable , KubernetesResource +public class SFlowConfig implements Editable , KubernetesResource { @JsonProperty("collectors") @@ -66,10 +66,10 @@ public class NetworkSpecENFNetFlow implements Editable collectors) { + public SFlowConfig(List collectors) { super(); this.collectors = collectors; } @@ -86,12 +86,12 @@ public void setCollectors(List collectors) { } @JsonIgnore - public NetworkSpecENFNetFlowBuilder edit() { - return new NetworkSpecENFNetFlowBuilder(this); + public SFlowConfigBuilder edit() { + return new SFlowConfigBuilder(this); } @JsonIgnore - public NetworkSpecENFNetFlowBuilder toBuilder() { + public SFlowConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecServers.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Server.java similarity index 88% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecServers.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Server.java index 7984a452650..084e4191f22 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecServers.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Server.java @@ -55,11 +55,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecServers implements Editable , KubernetesResource +public class Server implements Editable , KubernetesResource { @JsonProperty("forwardPlugin") - private DNSSpecSForwardPlugin forwardPlugin; + private ForwardPlugin forwardPlugin; @JsonProperty("name") private String name; @JsonProperty("zones") @@ -72,10 +72,10 @@ public class DNSSpecServers implements Editable , Kuberne * No args constructor for use in serialization * */ - public DNSSpecServers() { + public Server() { } - public DNSSpecServers(DNSSpecSForwardPlugin forwardPlugin, String name, List zones) { + public Server(ForwardPlugin forwardPlugin, String name, List zones) { super(); this.forwardPlugin = forwardPlugin; this.name = name; @@ -83,12 +83,12 @@ public DNSSpecServers(DNSSpecSForwardPlugin forwardPlugin, String name, List zones) { } @JsonIgnore - public DNSSpecServersBuilder edit() { - return new DNSSpecServersBuilder(this); + public ServerBuilder edit() { + return new ServerBuilder(this); } @JsonIgnore - public DNSSpecServersBuilder toBuilder() { + public ServerBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusServiceAccountIssuers.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java similarity index 87% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusServiceAccountIssuers.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java index 392352c8398..4322fa6a531 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatusServiceAccountIssuers.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class KubeAPIServerStatusServiceAccountIssuers implements Editable , KubernetesResource +public class ServiceAccountIssuerStatus implements Editable , KubernetesResource { @JsonProperty("expirationTime") @@ -66,10 +66,10 @@ public class KubeAPIServerStatusServiceAccountIssuers implements Editable , Kuber @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class ServiceCAStatus implements Editable , Kuber public ServiceCAStatus() { } - public ServiceCAStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public ServiceCAStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public ServiceCAStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCAStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCAStatusConditions.java deleted file mode 100644 index ab3a8dc6d16..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCAStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ServiceCAStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ServiceCAStatusConditions() { - } - - public ServiceCAStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public ServiceCAStatusConditionsBuilder edit() { - return new ServiceCAStatusConditionsBuilder(this); - } - - @JsonIgnore - public ServiceCAStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCAStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCAStatusGenerations.java deleted file mode 100644 index 2ce8d09ee10..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCAStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ServiceCAStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ServiceCAStatusGenerations() { - } - - public ServiceCAStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public ServiceCAStatusGenerationsBuilder edit() { - return new ServiceCAStatusGenerationsBuilder(this); - } - - @JsonIgnore - public ServiceCAStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java similarity index 53% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java index 9799f12979a..f8247f3a9f6 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java @@ -13,8 +13,8 @@ import com.fasterxml.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.ObjectMeta; @@ -22,8 +22,12 @@ 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; @@ -31,11 +35,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" + "apiVersion", + "kind", + "metadata", + "spec", + "status" }) @ToString @EqualsAndHashCode @@ -54,20 +58,35 @@ @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("operator.openshift.io") @Generated("jsonschema2pojo") -public class IngressControllerStatusConditions implements Editable , KubernetesResource +public class ServiceCatalogAPIServer implements Editable , HasMetadata { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ServiceCatalogAPIServer"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private ServiceCatalogAPIServerSpec spec; @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + private ServiceCatalogAPIServerStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,75 +94,95 @@ public class IngressControllerStatusConditions implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ServiceCatalogAPIServerList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceCatalogAPIServerList() { + } + + public ServiceCatalogAPIServerList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public ServiceCatalogAPIServerListBuilder edit() { + return new ServiceCatalogAPIServerListBuilder(this); + } + + @JsonIgnore + public ServiceCatalogAPIServerListBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServerSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServerSpec.java new file mode 100644 index 00000000000..8064fc7dd64 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServerSpec.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "logLevel", + "managementState", + "observedConfig", + "operatorLogLevel", + "unsupportedConfigOverrides" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ServiceCatalogAPIServerSpec implements Editable , KubernetesResource +{ + + @JsonProperty("logLevel") + private String logLevel; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("observedConfig") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object observedConfig; + @JsonProperty("operatorLogLevel") + private String operatorLogLevel; + @JsonProperty("unsupportedConfigOverrides") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object unsupportedConfigOverrides; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceCatalogAPIServerSpec() { + } + + public ServiceCatalogAPIServerSpec(String logLevel, String managementState, Object observedConfig, String operatorLogLevel, Object unsupportedConfigOverrides) { + super(); + this.logLevel = logLevel; + this.managementState = managementState; + this.observedConfig = observedConfig; + this.operatorLogLevel = operatorLogLevel; + this.unsupportedConfigOverrides = unsupportedConfigOverrides; + } + + @JsonProperty("logLevel") + public String getLogLevel() { + return logLevel; + } + + @JsonProperty("logLevel") + public void setLogLevel(String logLevel) { + this.logLevel = logLevel; + } + + @JsonProperty("managementState") + public String getManagementState() { + return managementState; + } + + @JsonProperty("managementState") + public void setManagementState(String managementState) { + this.managementState = managementState; + } + + @JsonProperty("observedConfig") + public Object getObservedConfig() { + return observedConfig; + } + + @JsonProperty("observedConfig") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setObservedConfig(Object observedConfig) { + this.observedConfig = observedConfig; + } + + @JsonProperty("operatorLogLevel") + public String getOperatorLogLevel() { + return operatorLogLevel; + } + + @JsonProperty("operatorLogLevel") + public void setOperatorLogLevel(String operatorLogLevel) { + this.operatorLogLevel = operatorLogLevel; + } + + @JsonProperty("unsupportedConfigOverrides") + public Object getUnsupportedConfigOverrides() { + return unsupportedConfigOverrides; + } + + @JsonProperty("unsupportedConfigOverrides") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setUnsupportedConfigOverrides(Object unsupportedConfigOverrides) { + this.unsupportedConfigOverrides = unsupportedConfigOverrides; + } + + @JsonIgnore + public ServiceCatalogAPIServerSpecBuilder edit() { + return new ServiceCatalogAPIServerSpecBuilder(this); + } + + @JsonIgnore + public ServiceCatalogAPIServerSpecBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServerStatus.java new file mode 100644 index 00000000000..a3cab1c2a63 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServerStatus.java @@ -0,0 +1,184 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "conditions", + "generations", + "latestAvailableRevision", + "observedGeneration", + "readyReplicas", + "version" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ServiceCatalogAPIServerStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceCatalogAPIServerStatus() { + } + + public ServiceCatalogAPIServerStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { + super(); + this.conditions = conditions; + this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; + this.observedGeneration = observedGeneration; + this.readyReplicas = readyReplicas; + this.version = version; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGenerations() { + return generations; + } + + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; + } + + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; + } + + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public ServiceCatalogAPIServerStatusBuilder edit() { + return new ServiceCatalogAPIServerStatusBuilder(this); + } + + @JsonIgnore + public ServiceCatalogAPIServerStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java similarity index 51% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java index 6b85a0903f1..3c6d88debac 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredentialStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java @@ -13,8 +13,8 @@ import com.fasterxml.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.ObjectMeta; @@ -22,8 +22,12 @@ 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; @@ -31,11 +35,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" + "apiVersion", + "kind", + "metadata", + "spec", + "status" }) @ToString @EqualsAndHashCode @@ -54,20 +58,35 @@ @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("operator.openshift.io") @Generated("jsonschema2pojo") -public class CloudCredentialStatusConditions implements Editable , KubernetesResource +public class ServiceCatalogControllerManager implements Editable , HasMetadata { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ServiceCatalogControllerManager"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private ServiceCatalogControllerManagerSpec spec; @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + private ServiceCatalogControllerManagerStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,75 +94,95 @@ public class CloudCredentialStatusConditions implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ServiceCatalogControllerManagerList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceCatalogControllerManagerList() { + } + + public ServiceCatalogControllerManagerList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public ServiceCatalogControllerManagerListBuilder edit() { + return new ServiceCatalogControllerManagerListBuilder(this); + } + + @JsonIgnore + public ServiceCatalogControllerManagerListBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManagerSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManagerSpec.java new file mode 100644 index 00000000000..33828e313a9 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManagerSpec.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "logLevel", + "managementState", + "observedConfig", + "operatorLogLevel", + "unsupportedConfigOverrides" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ServiceCatalogControllerManagerSpec implements Editable , KubernetesResource +{ + + @JsonProperty("logLevel") + private String logLevel; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("observedConfig") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object observedConfig; + @JsonProperty("operatorLogLevel") + private String operatorLogLevel; + @JsonProperty("unsupportedConfigOverrides") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object unsupportedConfigOverrides; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceCatalogControllerManagerSpec() { + } + + public ServiceCatalogControllerManagerSpec(String logLevel, String managementState, Object observedConfig, String operatorLogLevel, Object unsupportedConfigOverrides) { + super(); + this.logLevel = logLevel; + this.managementState = managementState; + this.observedConfig = observedConfig; + this.operatorLogLevel = operatorLogLevel; + this.unsupportedConfigOverrides = unsupportedConfigOverrides; + } + + @JsonProperty("logLevel") + public String getLogLevel() { + return logLevel; + } + + @JsonProperty("logLevel") + public void setLogLevel(String logLevel) { + this.logLevel = logLevel; + } + + @JsonProperty("managementState") + public String getManagementState() { + return managementState; + } + + @JsonProperty("managementState") + public void setManagementState(String managementState) { + this.managementState = managementState; + } + + @JsonProperty("observedConfig") + public Object getObservedConfig() { + return observedConfig; + } + + @JsonProperty("observedConfig") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setObservedConfig(Object observedConfig) { + this.observedConfig = observedConfig; + } + + @JsonProperty("operatorLogLevel") + public String getOperatorLogLevel() { + return operatorLogLevel; + } + + @JsonProperty("operatorLogLevel") + public void setOperatorLogLevel(String operatorLogLevel) { + this.operatorLogLevel = operatorLogLevel; + } + + @JsonProperty("unsupportedConfigOverrides") + public Object getUnsupportedConfigOverrides() { + return unsupportedConfigOverrides; + } + + @JsonProperty("unsupportedConfigOverrides") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setUnsupportedConfigOverrides(Object unsupportedConfigOverrides) { + this.unsupportedConfigOverrides = unsupportedConfigOverrides; + } + + @JsonIgnore + public ServiceCatalogControllerManagerSpecBuilder edit() { + return new ServiceCatalogControllerManagerSpecBuilder(this); + } + + @JsonIgnore + public ServiceCatalogControllerManagerSpecBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManagerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManagerStatus.java new file mode 100644 index 00000000000..6c6b777887b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManagerStatus.java @@ -0,0 +1,184 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "conditions", + "generations", + "latestAvailableRevision", + "observedGeneration", + "readyReplicas", + "version" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ServiceCatalogControllerManagerStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceCatalogControllerManagerStatus() { + } + + public ServiceCatalogControllerManagerStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { + super(); + this.conditions = conditions; + this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; + this.observedGeneration = observedGeneration; + this.readyReplicas = readyReplicas; + this.version = version; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGenerations() { + return generations; + } + + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; + } + + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; + } + + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public ServiceCatalogControllerManagerStatusBuilder edit() { + return new ServiceCatalogControllerManagerStatusBuilder(this); + } + + @JsonIgnore + public ServiceCatalogControllerManagerStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSimpleMacvlanConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/SimpleMacvlanConfig.java similarity index 83% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSimpleMacvlanConfig.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/SimpleMacvlanConfig.java index 31d2b604e4e..3844c734d8c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSimpleMacvlanConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/SimpleMacvlanConfig.java @@ -54,17 +54,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecANSimpleMacvlanConfig implements Editable , KubernetesResource +public class SimpleMacvlanConfig implements Editable , KubernetesResource { @JsonProperty("ipamConfig") - private NetworkSpecANSMCIpamConfig ipamConfig; + private IPAMConfig ipamConfig; @JsonProperty("master") private String master; @JsonProperty("mode") private String mode; @JsonProperty("mtu") - private Integer mtu; + private Long mtu; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class NetworkSpecANSimpleMacvlanConfig implements Editable , KubernetesResource +public class StaticIPAMAddresses implements Editable , KubernetesResource { @JsonProperty("address") @@ -66,10 +66,10 @@ public class NetworkSpecANSMCICSIAddresses implements Editable , KubernetesResource +public class StaticIPAMConfig implements Editable , KubernetesResource { @JsonProperty("addresses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List addresses = new ArrayList<>(); + private List addresses = new ArrayList<>(); @JsonProperty("dns") - private NetworkSpecANSMCICSIDns dns; + private StaticIPAMDNS dns; @JsonProperty("routes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List routes = new ArrayList<>(); + private List routes = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,10 +73,10 @@ public class NetworkSpecANSMCICStaticIPAMConfig implements Editable addresses, NetworkSpecANSMCICSIDns dns, List routes) { + public StaticIPAMConfig(List addresses, StaticIPAMDNS dns, List routes) { super(); this.addresses = addresses; this.dns = dns; @@ -85,43 +85,43 @@ public NetworkSpecANSMCICStaticIPAMConfig(List ad @JsonProperty("addresses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAddresses() { + public List getAddresses() { return addresses; } @JsonProperty("addresses") - public void setAddresses(List addresses) { + public void setAddresses(List addresses) { this.addresses = addresses; } @JsonProperty("dns") - public NetworkSpecANSMCICSIDns getDns() { + public StaticIPAMDNS getDns() { return dns; } @JsonProperty("dns") - public void setDns(NetworkSpecANSMCICSIDns dns) { + public void setDns(StaticIPAMDNS dns) { this.dns = dns; } @JsonProperty("routes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRoutes() { + public List getRoutes() { return routes; } @JsonProperty("routes") - public void setRoutes(List routes) { + public void setRoutes(List routes) { this.routes = routes; } @JsonIgnore - public NetworkSpecANSMCICStaticIPAMConfigBuilder edit() { - return new NetworkSpecANSMCICStaticIPAMConfigBuilder(this); + public StaticIPAMConfigBuilder edit() { + return new StaticIPAMConfigBuilder(this); } @JsonIgnore - public NetworkSpecANSMCICStaticIPAMConfigBuilder toBuilder() { + public StaticIPAMConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSMCICSIDns.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticIPAMDNS.java similarity index 91% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSMCICSIDns.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticIPAMDNS.java index c31881ac7f6..75f3eeca359 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSMCICSIDns.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticIPAMDNS.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecANSMCICSIDns implements Editable , KubernetesResource +public class StaticIPAMDNS implements Editable , KubernetesResource { @JsonProperty("domain") @@ -73,10 +73,10 @@ public class NetworkSpecANSMCICSIDns implements Editable nameservers, List search) { + public StaticIPAMDNS(String domain, List nameservers, List search) { super(); this.domain = domain; this.nameservers = nameservers; @@ -116,12 +116,12 @@ public void setSearch(List search) { } @JsonIgnore - public NetworkSpecANSMCICSIDnsBuilder edit() { - return new NetworkSpecANSMCICSIDnsBuilder(this); + public StaticIPAMDNSBuilder edit() { + return new StaticIPAMDNSBuilder(this); } @JsonIgnore - public NetworkSpecANSMCICSIDnsBuilder toBuilder() { + public StaticIPAMDNSBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSMCICSIRoutes.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticIPAMRoutes.java similarity index 89% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSMCICSIRoutes.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticIPAMRoutes.java index 7b0b55fc1aa..b5dc91e65e6 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecANSMCICSIRoutes.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticIPAMRoutes.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecANSMCICSIRoutes implements Editable , KubernetesResource +public class StaticIPAMRoutes implements Editable , KubernetesResource { @JsonProperty("destination") @@ -66,10 +66,10 @@ public class NetworkSpecANSMCICSIRoutes implements Editable , KubernetesResource +{ + + @JsonProperty("failedRevisionLimit") + private Integer failedRevisionLimit; + @JsonProperty("forceRedeploymentReason") + private String forceRedeploymentReason; + @JsonProperty("logLevel") + private String logLevel; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("observedConfig") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object observedConfig; + @JsonProperty("operatorLogLevel") + private String operatorLogLevel; + @JsonProperty("succeededRevisionLimit") + private Integer succeededRevisionLimit; + @JsonProperty("unsupportedConfigOverrides") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object unsupportedConfigOverrides; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StaticPodOperatorSpec() { + } + + public StaticPodOperatorSpec(Integer failedRevisionLimit, String forceRedeploymentReason, String logLevel, String managementState, Object observedConfig, String operatorLogLevel, Integer succeededRevisionLimit, Object unsupportedConfigOverrides) { + super(); + this.failedRevisionLimit = failedRevisionLimit; + this.forceRedeploymentReason = forceRedeploymentReason; + this.logLevel = logLevel; + this.managementState = managementState; + this.observedConfig = observedConfig; + this.operatorLogLevel = operatorLogLevel; + this.succeededRevisionLimit = succeededRevisionLimit; + this.unsupportedConfigOverrides = unsupportedConfigOverrides; + } + + @JsonProperty("failedRevisionLimit") + public Integer getFailedRevisionLimit() { + return failedRevisionLimit; + } + + @JsonProperty("failedRevisionLimit") + public void setFailedRevisionLimit(Integer failedRevisionLimit) { + this.failedRevisionLimit = failedRevisionLimit; + } + + @JsonProperty("forceRedeploymentReason") + public String getForceRedeploymentReason() { + return forceRedeploymentReason; + } + + @JsonProperty("forceRedeploymentReason") + public void setForceRedeploymentReason(String forceRedeploymentReason) { + this.forceRedeploymentReason = forceRedeploymentReason; + } + + @JsonProperty("logLevel") + public String getLogLevel() { + return logLevel; + } + + @JsonProperty("logLevel") + public void setLogLevel(String logLevel) { + this.logLevel = logLevel; + } + + @JsonProperty("managementState") + public String getManagementState() { + return managementState; + } + + @JsonProperty("managementState") + public void setManagementState(String managementState) { + this.managementState = managementState; + } + + @JsonProperty("observedConfig") + public Object getObservedConfig() { + return observedConfig; + } + + @JsonProperty("observedConfig") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setObservedConfig(Object observedConfig) { + this.observedConfig = observedConfig; + } + + @JsonProperty("operatorLogLevel") + public String getOperatorLogLevel() { + return operatorLogLevel; + } + + @JsonProperty("operatorLogLevel") + public void setOperatorLogLevel(String operatorLogLevel) { + this.operatorLogLevel = operatorLogLevel; + } + + @JsonProperty("succeededRevisionLimit") + public Integer getSucceededRevisionLimit() { + return succeededRevisionLimit; + } + + @JsonProperty("succeededRevisionLimit") + public void setSucceededRevisionLimit(Integer succeededRevisionLimit) { + this.succeededRevisionLimit = succeededRevisionLimit; + } + + @JsonProperty("unsupportedConfigOverrides") + public Object getUnsupportedConfigOverrides() { + return unsupportedConfigOverrides; + } + + @JsonProperty("unsupportedConfigOverrides") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setUnsupportedConfigOverrides(Object unsupportedConfigOverrides) { + this.unsupportedConfigOverrides = unsupportedConfigOverrides; + } + + @JsonIgnore + public StaticPodOperatorSpecBuilder edit() { + return new StaticPodOperatorSpecBuilder(this); + } + + @JsonIgnore + public StaticPodOperatorSpecBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticPodOperatorStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticPodOperatorStatus.java new file mode 100644 index 00000000000..9da07aa56d7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StaticPodOperatorStatus.java @@ -0,0 +1,214 @@ + +package io.fabric8.openshift.api.model.operator.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "conditions", + "generations", + "latestAvailableRevision", + "latestAvailableRevisionReason", + "nodeStatuses", + "observedGeneration", + "readyReplicas", + "version" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class StaticPodOperatorStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; + @JsonProperty("latestAvailableRevisionReason") + private String latestAvailableRevisionReason; + @JsonProperty("nodeStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List nodeStatuses = new ArrayList<>(); + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StaticPodOperatorStatus() { + } + + public StaticPodOperatorStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { + super(); + this.conditions = conditions; + this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; + this.latestAvailableRevisionReason = latestAvailableRevisionReason; + this.nodeStatuses = nodeStatuses; + this.observedGeneration = observedGeneration; + this.readyReplicas = readyReplicas; + this.version = version; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGenerations() { + return generations; + } + + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; + } + + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevisionReason") + public String getLatestAvailableRevisionReason() { + return latestAvailableRevisionReason; + } + + @JsonProperty("latestAvailableRevisionReason") + public void setLatestAvailableRevisionReason(String latestAvailableRevisionReason) { + this.latestAvailableRevisionReason = latestAvailableRevisionReason; + } + + @JsonProperty("nodeStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNodeStatuses() { + return nodeStatuses; + } + + @JsonProperty("nodeStatuses") + public void setNodeStatuses(List nodeStatuses) { + this.nodeStatuses = nodeStatuses; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; + } + + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public StaticPodOperatorStatusBuilder edit() { + return new StaticPodOperatorStatusBuilder(this); + } + + @JsonIgnore + public StaticPodOperatorStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecPStatuspage.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StatuspageProvider.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecPStatuspage.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StatuspageProvider.java index b6550612370..e8505f2c7e5 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleSpecPStatuspage.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StatuspageProvider.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConsoleSpecPStatuspage implements Editable , KubernetesResource +public class StatuspageProvider implements Editable , KubernetesResource { @JsonProperty("pageID") @@ -63,10 +63,10 @@ public class ConsoleSpecPStatuspage implements Editable , Kubernete @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -82,10 +85,11 @@ public class StorageStatus implements Editable , Kubernete public StorageStatus() { } - public StorageStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { + public StorageStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; this.version = version; @@ -93,26 +97,36 @@ public StorageStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageStatusConditions.java deleted file mode 100644 index 409a8be0c91..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageStatusConditions.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class StorageStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public StorageStatusConditions() { - } - - public StorageStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public StorageStatusConditionsBuilder edit() { - return new StorageStatusConditionsBuilder(this); - } - - @JsonIgnore - public StorageStatusConditionsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageStatusGenerations.java deleted file mode 100644 index 986336fa58e..00000000000 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageStatusGenerations.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "group", - "hash", - "lastGeneration", - "name", - "namespace", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class StorageStatusGenerations implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - @JsonProperty("hash") - private String hash; - @JsonProperty("lastGeneration") - private Long lastGeneration; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public StorageStatusGenerations() { - } - - public StorageStatusGenerations(String group, String hash, Long lastGeneration, String name, String namespace, String resource) { - super(); - this.group = group; - this.hash = hash; - this.lastGeneration = lastGeneration; - this.name = name; - this.namespace = namespace; - this.resource = resource; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - @JsonProperty("hash") - public String getHash() { - return hash; - } - - @JsonProperty("hash") - public void setHash(String hash) { - this.hash = hash; - } - - @JsonProperty("lastGeneration") - public Long getLastGeneration() { - return lastGeneration; - } - - @JsonProperty("lastGeneration") - public void setLastGeneration(Long lastGeneration) { - this.lastGeneration = lastGeneration; - } - - @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("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public StorageStatusGenerationsBuilder edit() { - return new StorageStatusGenerationsBuilder(this); - } - - @JsonIgnore - public StorageStatusGenerationsBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADSyslog.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/SyslogLoggingDestinationParameters.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADSyslog.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/SyslogLoggingDestinationParameters.java index 4efc273dd17..4ae11f12609 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecLADSyslog.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/SyslogLoggingDestinationParameters.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecLADSyslog implements Editable , KubernetesResource +public class SyslogLoggingDestinationParameters implements Editable , KubernetesResource { @JsonProperty("address") @@ -62,9 +62,9 @@ public class IngressControllerSpecLADSyslog implements Editable additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class IngressControllerSpecLADSyslog implements Editable , KubernetesResource +public class Upstream implements Editable , KubernetesResource { @JsonProperty("address") private String address; @JsonProperty("port") - private Integer port; + private Long port; @JsonProperty("type") private String type; @JsonIgnore @@ -69,10 +69,10 @@ public class DNSSpecURUpstreams implements Editable , * No args constructor for use in serialization * */ - public DNSSpecURUpstreams() { + public Upstream() { } - public DNSSpecURUpstreams(String address, Integer port, String type) { + public Upstream(String address, Long port, String type) { super(); this.address = address; this.port = port; @@ -90,12 +90,12 @@ public void setAddress(String address) { } @JsonProperty("port") - public Integer getPort() { + public Long getPort() { return port; } @JsonProperty("port") - public void setPort(Integer port) { + public void setPort(Long port) { this.port = port; } @@ -110,12 +110,12 @@ public void setType(String type) { } @JsonIgnore - public DNSSpecURUpstreamsBuilder edit() { - return new DNSSpecURUpstreamsBuilder(this); + public UpstreamBuilder edit() { + return new UpstreamBuilder(this); } @JsonIgnore - public DNSSpecURUpstreamsBuilder toBuilder() { + public UpstreamBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecUpstreamResolvers.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java similarity index 83% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecUpstreamResolvers.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java index 0684ec40089..49b2c1b23b7 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpecUpstreamResolvers.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java @@ -56,7 +56,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecUpstreamResolvers implements Editable , KubernetesResource +public class UpstreamResolvers implements Editable , KubernetesResource { @JsonProperty("policy") @@ -64,10 +64,10 @@ public class DNSSpecUpstreamResolvers implements Editable upstreams = new ArrayList<>(); + private List upstreams = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,10 +75,10 @@ public class DNSSpecUpstreamResolvers implements Editable upstreams) { + public UpstreamResolvers(String policy, String protocolStrategy, DNSTransportConfig transportConfig, List upstreams) { super(); this.policy = policy; this.protocolStrategy = protocolStrategy; @@ -107,33 +107,33 @@ public void setProtocolStrategy(String protocolStrategy) { } @JsonProperty("transportConfig") - public DNSSpecURTransportConfig getTransportConfig() { + public DNSTransportConfig getTransportConfig() { return transportConfig; } @JsonProperty("transportConfig") - public void setTransportConfig(DNSSpecURTransportConfig transportConfig) { + public void setTransportConfig(DNSTransportConfig transportConfig) { this.transportConfig = transportConfig; } @JsonProperty("upstreams") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getUpstreams() { + public List getUpstreams() { return upstreams; } @JsonProperty("upstreams") - public void setUpstreams(List upstreams) { + public void setUpstreams(List upstreams) { this.upstreams = upstreams; } @JsonIgnore - public DNSSpecUpstreamResolversBuilder edit() { - return new DNSSpecUpstreamResolversBuilder(this); + public UpstreamResolversBuilder edit() { + return new UpstreamResolversBuilder(this); } @JsonIgnore - public DNSSpecUpstreamResolversBuilder toBuilder() { + public UpstreamResolversBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCVSphere.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java similarity index 79% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCVSphere.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java index 2a8ea2d0dfd..2e05b6cb185 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpecDCVSphere.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java @@ -56,15 +56,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterCSIDriverSpecDCVSphere implements Editable , KubernetesResource +public class VSphereCSIDriverConfigSpec implements Editable , KubernetesResource { @JsonProperty("globalMaxSnapshotsPerBlockVolume") - private Integer globalMaxSnapshotsPerBlockVolume; + private Long globalMaxSnapshotsPerBlockVolume; @JsonProperty("granularMaxSnapshotsPerBlockVolumeInVSAN") - private Integer granularMaxSnapshotsPerBlockVolumeInVSAN; + private Long granularMaxSnapshotsPerBlockVolumeInVSAN; @JsonProperty("granularMaxSnapshotsPerBlockVolumeInVVOL") - private Integer granularMaxSnapshotsPerBlockVolumeInVVOL; + private Long granularMaxSnapshotsPerBlockVolumeInVVOL; @JsonProperty("topologyCategories") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List topologyCategories = new ArrayList<>(); @@ -75,10 +75,10 @@ public class ClusterCSIDriverSpecDCVSphere implements Editable topologyCategories) { + public VSphereCSIDriverConfigSpec(Long globalMaxSnapshotsPerBlockVolume, Long granularMaxSnapshotsPerBlockVolumeInVSAN, Long granularMaxSnapshotsPerBlockVolumeInVVOL, List topologyCategories) { super(); this.globalMaxSnapshotsPerBlockVolume = globalMaxSnapshotsPerBlockVolume; this.granularMaxSnapshotsPerBlockVolumeInVSAN = granularMaxSnapshotsPerBlockVolumeInVSAN; @@ -87,32 +87,32 @@ public ClusterCSIDriverSpecDCVSphere(Integer globalMaxSnapshotsPerBlockVolume, I } @JsonProperty("globalMaxSnapshotsPerBlockVolume") - public Integer getGlobalMaxSnapshotsPerBlockVolume() { + public Long getGlobalMaxSnapshotsPerBlockVolume() { return globalMaxSnapshotsPerBlockVolume; } @JsonProperty("globalMaxSnapshotsPerBlockVolume") - public void setGlobalMaxSnapshotsPerBlockVolume(Integer globalMaxSnapshotsPerBlockVolume) { + public void setGlobalMaxSnapshotsPerBlockVolume(Long globalMaxSnapshotsPerBlockVolume) { this.globalMaxSnapshotsPerBlockVolume = globalMaxSnapshotsPerBlockVolume; } @JsonProperty("granularMaxSnapshotsPerBlockVolumeInVSAN") - public Integer getGranularMaxSnapshotsPerBlockVolumeInVSAN() { + public Long getGranularMaxSnapshotsPerBlockVolumeInVSAN() { return granularMaxSnapshotsPerBlockVolumeInVSAN; } @JsonProperty("granularMaxSnapshotsPerBlockVolumeInVSAN") - public void setGranularMaxSnapshotsPerBlockVolumeInVSAN(Integer granularMaxSnapshotsPerBlockVolumeInVSAN) { + public void setGranularMaxSnapshotsPerBlockVolumeInVSAN(Long granularMaxSnapshotsPerBlockVolumeInVSAN) { this.granularMaxSnapshotsPerBlockVolumeInVSAN = granularMaxSnapshotsPerBlockVolumeInVSAN; } @JsonProperty("granularMaxSnapshotsPerBlockVolumeInVVOL") - public Integer getGranularMaxSnapshotsPerBlockVolumeInVVOL() { + public Long getGranularMaxSnapshotsPerBlockVolumeInVVOL() { return granularMaxSnapshotsPerBlockVolumeInVVOL; } @JsonProperty("granularMaxSnapshotsPerBlockVolumeInVVOL") - public void setGranularMaxSnapshotsPerBlockVolumeInVVOL(Integer granularMaxSnapshotsPerBlockVolumeInVVOL) { + public void setGranularMaxSnapshotsPerBlockVolumeInVVOL(Long granularMaxSnapshotsPerBlockVolumeInVVOL) { this.granularMaxSnapshotsPerBlockVolumeInVVOL = granularMaxSnapshotsPerBlockVolumeInVVOL; } @@ -128,12 +128,12 @@ public void setTopologyCategories(List topologyCategories) { } @JsonIgnore - public ClusterCSIDriverSpecDCVSphereBuilder edit() { - return new ClusterCSIDriverSpecDCVSphereBuilder(this); + public VSphereCSIDriverConfigSpecBuilder edit() { + return new VSphereCSIDriverConfigSpecBuilder(this); } @JsonIgnore - public ClusterCSIDriverSpecDCVSphereBuilder toBuilder() { + public VSphereCSIDriverConfigSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecCTClientCA.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/BackupJobReference.java similarity index 80% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecCTClientCA.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/BackupJobReference.java index da68ec66f37..60acde3425f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerSpecCTClientCA.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/BackupJobReference.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "name", + "namespace" }) @ToString @EqualsAndHashCode @@ -51,11 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressControllerSpecCTClientCA implements Editable , KubernetesResource +public class BackupJobReference implements Editable , KubernetesResource { @JsonProperty("name") private String name; + @JsonProperty("namespace") + private String namespace; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,12 +66,13 @@ public class IngressControllerSpecCTClientCA implements Editable , KubernetesResource +{ + + @JsonProperty("disabled") + private Boolean disabled; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DelegatedAuthentication() { + } + + public DelegatedAuthentication(Boolean disabled) { + super(); + this.disabled = disabled; + } + + @JsonProperty("disabled") + public Boolean getDisabled() { + return disabled; + } + + @JsonProperty("disabled") + public void setDisabled(Boolean disabled) { + this.disabled = disabled; + } + + @JsonIgnore + public DelegatedAuthenticationBuilder edit() { + return new DelegatedAuthenticationBuilder(this); + } + + @JsonIgnore + public DelegatedAuthenticationBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOEKms.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/DelegatedAuthorization.java similarity index 79% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOEKms.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/DelegatedAuthorization.java index 31f7dc03aa3..46f9ae14886 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSOEKms.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/DelegatedAuthorization.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.imageregistry.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "keyID" + "disabled" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSOEKms implements Editable , KubernetesResource +public class DelegatedAuthorization implements Editable , KubernetesResource { - @JsonProperty("keyID") - private String keyID; + @JsonProperty("disabled") + private Boolean disabled; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ConfigSpecSOEKms implements Editable , Kub * No args constructor for use in serialization * */ - public ConfigSpecSOEKms() { + public DelegatedAuthorization() { } - public ConfigSpecSOEKms(String keyID) { + public DelegatedAuthorization(Boolean disabled) { super(); - this.keyID = keyID; + this.disabled = disabled; } - @JsonProperty("keyID") - public String getKeyID() { - return keyID; + @JsonProperty("disabled") + public Boolean getDisabled() { + return disabled; } - @JsonProperty("keyID") - public void setKeyID(String keyID) { - this.keyID = keyID; + @JsonProperty("disabled") + public void setDisabled(Boolean disabled) { + this.disabled = disabled; } @JsonIgnore - public ConfigSpecSOEKmsBuilder edit() { - return new ConfigSpecSOEKmsBuilder(this); + public DelegatedAuthorizationBuilder edit() { + return new DelegatedAuthorizationBuilder(this); } @JsonIgnore - public ConfigSpecSOEKmsBuilder toBuilder() { + public DelegatedAuthorizationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackup.java similarity index 53% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackup.java index 8e2579be50b..f269118f4f4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/InsightsOperatorStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackup.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -13,8 +13,8 @@ import com.fasterxml.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.ObjectMeta; @@ -22,8 +22,12 @@ 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; @@ -31,11 +35,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" + "apiVersion", + "kind", + "metadata", + "spec", + "status" }) @ToString @EqualsAndHashCode @@ -54,20 +58,35 @@ @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("operator.openshift.io") @Generated("jsonschema2pojo") -public class InsightsOperatorStatusConditions implements Editable , KubernetesResource +public class EtcdBackup implements Editable , HasMetadata { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "EtcdBackup"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private EtcdBackupSpec spec; @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + private EtcdBackupStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,75 +94,95 @@ public class InsightsOperatorStatusConditions implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1alpha1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "EtcdBackupList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EtcdBackupList() { + } + + public EtcdBackupList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public EtcdBackupListBuilder edit() { + return new EtcdBackupListBuilder(this); + } + + @JsonIgnore + public EtcdBackupListBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSPvc.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackupSpec.java similarity index 82% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSPvc.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackupSpec.java index 46f0da981b4..e9120982e97 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecSPvc.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackupSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.imageregistry.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "claim" + "pvcName" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecSPvc implements Editable , KubernetesResource +public class EtcdBackupSpec implements Editable , KubernetesResource { - @JsonProperty("claim") - private String claim; + @JsonProperty("pvcName") + private String pvcName; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ConfigSpecSPvc implements Editable , Kuberne * No args constructor for use in serialization * */ - public ConfigSpecSPvc() { + public EtcdBackupSpec() { } - public ConfigSpecSPvc(String claim) { + public EtcdBackupSpec(String pvcName) { super(); - this.claim = claim; + this.pvcName = pvcName; } - @JsonProperty("claim") - public String getClaim() { - return claim; + @JsonProperty("pvcName") + public String getPvcName() { + return pvcName; } - @JsonProperty("claim") - public void setClaim(String claim) { - this.claim = claim; + @JsonProperty("pvcName") + public void setPvcName(String pvcName) { + this.pvcName = pvcName; } @JsonIgnore - public ConfigSpecSPvcBuilder edit() { - return new ConfigSpecSPvcBuilder(this); + public EtcdBackupSpecBuilder edit() { + return new EtcdBackupSpecBuilder(this); } @JsonIgnore - public ConfigSpecSPvcBuilder toBuilder() { + public EtcdBackupSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackupStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackupStatus.java new file mode 100644 index 00000000000..4b58cc3201e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/EtcdBackupStatus.java @@ -0,0 +1,127 @@ + +package io.fabric8.openshift.api.model.operator.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Condition; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "backupJob", + "conditions" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class EtcdBackupStatus implements Editable , KubernetesResource +{ + + @JsonProperty("backupJob") + private BackupJobReference backupJob; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EtcdBackupStatus() { + } + + public EtcdBackupStatus(BackupJobReference backupJob, List conditions) { + super(); + this.backupJob = backupJob; + this.conditions = conditions; + } + + @JsonProperty("backupJob") + public BackupJobReference getBackupJob() { + return backupJob; + } + + @JsonProperty("backupJob") + public void setBackupJob(BackupJobReference backupJob) { + this.backupJob = backupJob; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonIgnore + public EtcdBackupStatusBuilder edit() { + return new EtcdBackupStatusBuilder(this); + } + + @JsonIgnore + public EtcdBackupStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConfigStatusGenerations.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/GenerationHistory.java similarity index 85% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConfigStatusGenerations.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/GenerationHistory.java index 17f31df23f7..d712eb7d447 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConfigStatusGenerations.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/GenerationHistory.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -32,7 +32,6 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "group", - "hash", "lastGeneration", "name", "namespace", @@ -56,13 +55,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigStatusGenerations implements Editable , KubernetesResource +public class GenerationHistory implements Editable , KubernetesResource { @JsonProperty("group") private String group; - @JsonProperty("hash") - private String hash; @JsonProperty("lastGeneration") private Long lastGeneration; @JsonProperty("name") @@ -78,13 +75,12 @@ public class ConfigStatusGenerations implements Editable , KubernetesResource, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1alpha1"; + @JsonProperty("authentication") + private DelegatedAuthentication authentication; + @JsonProperty("authorization") + private DelegatedAuthorization authorization; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "GenericOperatorConfig"; + @JsonProperty("leaderElection") + private LeaderElection leaderElection; + @JsonProperty("servingInfo") + private HTTPServingInfo servingInfo; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GenericOperatorConfig() { + } + + public GenericOperatorConfig(String apiVersion, DelegatedAuthentication authentication, DelegatedAuthorization authorization, String kind, LeaderElection leaderElection, HTTPServingInfo servingInfo) { + super(); + this.apiVersion = apiVersion; + this.authentication = authentication; + this.authorization = authorization; + this.kind = kind; + this.leaderElection = leaderElection; + this.servingInfo = servingInfo; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("authentication") + public DelegatedAuthentication getAuthentication() { + return authentication; + } + + @JsonProperty("authentication") + public void setAuthentication(DelegatedAuthentication authentication) { + this.authentication = authentication; + } + + @JsonProperty("authorization") + public DelegatedAuthorization getAuthorization() { + return authorization; + } + + @JsonProperty("authorization") + public void setAuthorization(DelegatedAuthorization authorization) { + this.authorization = authorization; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("leaderElection") + public LeaderElection getLeaderElection() { + return leaderElection; + } + + @JsonProperty("leaderElection") + public void setLeaderElection(LeaderElection leaderElection) { + this.leaderElection = leaderElection; + } + + @JsonProperty("servingInfo") + public HTTPServingInfo getServingInfo() { + return servingInfo; + } + + @JsonProperty("servingInfo") + public void setServingInfo(HTTPServingInfo servingInfo) { + this.servingInfo = servingInfo; + } + + @JsonIgnore + public GenericOperatorConfigBuilder edit() { + return new GenericOperatorConfigBuilder(this); + } + + @JsonIgnore + public GenericOperatorConfigBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpec.java index df5b24b5a1c..dc8e636b027 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpec.java @@ -58,7 +58,7 @@ public class ImageContentSourcePolicySpec implements Editable repositoryDigestMirrors = new ArrayList<>(); + private List repositoryDigestMirrors = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,19 +69,19 @@ public class ImageContentSourcePolicySpec implements Editable repositoryDigestMirrors) { + public ImageContentSourcePolicySpec(List repositoryDigestMirrors) { super(); this.repositoryDigestMirrors = repositoryDigestMirrors; } @JsonProperty("repositoryDigestMirrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRepositoryDigestMirrors() { + public List getRepositoryDigestMirrors() { return repositoryDigestMirrors; } @JsonProperty("repositoryDigestMirrors") - public void setRepositoryDigestMirrors(List repositoryDigestMirrors) { + public void setRepositoryDigestMirrors(List repositoryDigestMirrors) { this.repositoryDigestMirrors = repositoryDigestMirrors; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMMNetwork.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/LoggingConfig.java similarity index 75% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMMNetwork.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/LoggingConfig.java index a2085c210e2..461a7aaad54 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkSpecMMNetwork.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/LoggingConfig.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "from", - "to" + "level", + "vmodule" }) @ToString @EqualsAndHashCode @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecMMNetwork implements Editable , KubernetesResource +public class LoggingConfig implements Editable , KubernetesResource { - @JsonProperty("from") - private Integer from; - @JsonProperty("to") - private Integer to; + @JsonProperty("level") + private Long level; + @JsonProperty("vmodule") + private String vmodule; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class NetworkSpecMMNetwork implements Editable , KubernetesResource +public class NodeStatus implements Editable , KubernetesResource { - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") + @JsonProperty("currentDeploymentGeneration") + private Integer currentDeploymentGeneration; + @JsonProperty("lastFailedDeploymentErrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>(); + private List lastFailedDeploymentErrors = new ArrayList<>(); + @JsonProperty("lastFailedDeploymentGeneration") + private Integer lastFailedDeploymentGeneration; + @JsonProperty("nodeName") + private String nodeName; + @JsonProperty("targetDeploymentGeneration") + private Integer targetDeploymentGeneration; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,44 +78,76 @@ public class ConfigSpecAPodAntiAffinity implements Editable preferredDuringSchedulingIgnoredDuringExecution, List requiredDuringSchedulingIgnoredDuringExecution) { + public NodeStatus(Integer currentDeploymentGeneration, List lastFailedDeploymentErrors, Integer lastFailedDeploymentGeneration, String nodeName, Integer targetDeploymentGeneration) { super(); - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; + this.currentDeploymentGeneration = currentDeploymentGeneration; + this.lastFailedDeploymentErrors = lastFailedDeploymentErrors; + this.lastFailedDeploymentGeneration = lastFailedDeploymentGeneration; + this.nodeName = nodeName; + this.targetDeploymentGeneration = targetDeploymentGeneration; } - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreferredDuringSchedulingIgnoredDuringExecution() { - return preferredDuringSchedulingIgnoredDuringExecution; + @JsonProperty("currentDeploymentGeneration") + public Integer getCurrentDeploymentGeneration() { + return currentDeploymentGeneration; } - @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution") - public void setPreferredDuringSchedulingIgnoredDuringExecution(List preferredDuringSchedulingIgnoredDuringExecution) { - this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution; + @JsonProperty("currentDeploymentGeneration") + public void setCurrentDeploymentGeneration(Integer currentDeploymentGeneration) { + this.currentDeploymentGeneration = currentDeploymentGeneration; } - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") + @JsonProperty("lastFailedDeploymentErrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRequiredDuringSchedulingIgnoredDuringExecution() { - return requiredDuringSchedulingIgnoredDuringExecution; + public List getLastFailedDeploymentErrors() { + return lastFailedDeploymentErrors; + } + + @JsonProperty("lastFailedDeploymentErrors") + public void setLastFailedDeploymentErrors(List lastFailedDeploymentErrors) { + this.lastFailedDeploymentErrors = lastFailedDeploymentErrors; + } + + @JsonProperty("lastFailedDeploymentGeneration") + public Integer getLastFailedDeploymentGeneration() { + return lastFailedDeploymentGeneration; + } + + @JsonProperty("lastFailedDeploymentGeneration") + public void setLastFailedDeploymentGeneration(Integer lastFailedDeploymentGeneration) { + this.lastFailedDeploymentGeneration = lastFailedDeploymentGeneration; + } + + @JsonProperty("nodeName") + public String getNodeName() { + return nodeName; + } + + @JsonProperty("nodeName") + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + @JsonProperty("targetDeploymentGeneration") + public Integer getTargetDeploymentGeneration() { + return targetDeploymentGeneration; } - @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution") - public void setRequiredDuringSchedulingIgnoredDuringExecution(List requiredDuringSchedulingIgnoredDuringExecution) { - this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution; + @JsonProperty("targetDeploymentGeneration") + public void setTargetDeploymentGeneration(Integer targetDeploymentGeneration) { + this.targetDeploymentGeneration = targetDeploymentGeneration; } @JsonIgnore - public ConfigSpecAPodAntiAffinityBuilder edit() { - return new ConfigSpecAPodAntiAffinityBuilder(this); + public NodeStatusBuilder edit() { + return new NodeStatusBuilder(this); } @JsonIgnore - public ConfigSpecAPodAntiAffinityBuilder toBuilder() { + public NodeStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OLM.java similarity index 55% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OLM.java index d12f3da900d..34fb17b82e5 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OLM.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -13,8 +13,8 @@ import com.fasterxml.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.ObjectMeta; @@ -22,8 +22,12 @@ 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; @@ -31,11 +35,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" + "apiVersion", + "kind", + "metadata", + "spec", + "status" }) @ToString @EqualsAndHashCode @@ -54,20 +58,35 @@ @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("operator.openshift.io") @Generated("jsonschema2pojo") -public class ClusterCSIDriverStatusConditions implements Editable , KubernetesResource +public class OLM implements Editable , HasMetadata { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "OLM"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private OLMSpec spec; @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + private OLMStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,75 +94,95 @@ public class ClusterCSIDriverStatusConditions implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "operator.openshift.io/v1alpha1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "OLMList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OLMList() { + } + + public OLMList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public OLMListBuilder edit() { + return new OLMListBuilder(this); + } + + @JsonIgnore + public OLMListBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusSuccesses.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OLMSpec.java similarity index 57% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusSuccesses.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OLMSpec.java index fdcf6204350..b82ebd4fab6 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckStatusSuccesses.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OLMSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.controlplane.v1alpha1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,11 +31,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "latency", - "message", - "reason", - "success", - "time" + "logLevel", + "managementState", + "observedConfig", + "operatorLogLevel", + "unsupportedConfigOverrides" }) @ToString @EqualsAndHashCode @@ -55,21 +55,21 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class PodNetworkConnectivityCheckStatusSuccesses implements Editable , KubernetesResource +public class OLMSpec implements Editable , KubernetesResource { - @JsonProperty("latency") + @JsonProperty("logLevel") + private String logLevel; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("observedConfig") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object latency; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("success") - private Boolean success; - @JsonProperty("time") + private Object observedConfig; + @JsonProperty("operatorLogLevel") + private String operatorLogLevel; + @JsonProperty("unsupportedConfigOverrides") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object time; + private Object unsupportedConfigOverrides; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,77 +77,77 @@ public class PodNetworkConnectivityCheckStatusSuccesses implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List generations = new ArrayList<>(); + @JsonProperty("latestAvailableRevision") + private Integer latestAvailableRevision; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OLMStatus() { + } + + public OLMStatus(List conditions, List generations, Integer latestAvailableRevision, Long observedGeneration, Integer readyReplicas, String version) { + super(); + this.conditions = conditions; + this.generations = generations; + this.latestAvailableRevision = latestAvailableRevision; + this.observedGeneration = observedGeneration; + this.readyReplicas = readyReplicas; + this.version = version; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("generations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGenerations() { + return generations; + } + + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; + } + + @JsonProperty("latestAvailableRevision") + public Integer getLatestAvailableRevision() { + return latestAvailableRevision; + } + + @JsonProperty("latestAvailableRevision") + public void setLatestAvailableRevision(Integer latestAvailableRevision) { + this.latestAvailableRevision = latestAvailableRevision; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; + } + + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public OLMStatusBuilder edit() { + return new OLMStatusBuilder(this); + } + + @JsonIgnore + public OLMStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatusConditions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OperatorCondition.java similarity index 90% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatusConditions.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OperatorCondition.java index 518ec5f5475..ed632793526 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EtcdStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OperatorCondition.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EtcdStatusConditions implements Editable , KubernetesResource +public class OperatorCondition implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class EtcdStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("imagePullPolicy") + private String imagePullPolicy; + @JsonProperty("imagePullSpec") + private String imagePullSpec; + @JsonProperty("logging") + private LoggingConfig logging; + @JsonProperty("managementState") + private String managementState; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OperatorSpec() { + } + + public OperatorSpec(String imagePullPolicy, String imagePullSpec, LoggingConfig logging, String managementState, String version) { + super(); + this.imagePullPolicy = imagePullPolicy; + this.imagePullSpec = imagePullSpec; + this.logging = logging; + this.managementState = managementState; + this.version = version; + } + + @JsonProperty("imagePullPolicy") + public String getImagePullPolicy() { + return imagePullPolicy; + } + + @JsonProperty("imagePullPolicy") + public void setImagePullPolicy(String imagePullPolicy) { + this.imagePullPolicy = imagePullPolicy; + } + + @JsonProperty("imagePullSpec") + public String getImagePullSpec() { + return imagePullSpec; + } + + @JsonProperty("imagePullSpec") + public void setImagePullSpec(String imagePullSpec) { + this.imagePullSpec = imagePullSpec; + } + + @JsonProperty("logging") + public LoggingConfig getLogging() { + return logging; + } + + @JsonProperty("logging") + public void setLogging(LoggingConfig logging) { + this.logging = logging; + } + + @JsonProperty("managementState") + public String getManagementState() { + return managementState; + } + + @JsonProperty("managementState") + public void setManagementState(String managementState) { + this.managementState = managementState; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public OperatorSpecBuilder edit() { + return new OperatorSpecBuilder(this); + } + + @JsonIgnore + public OperatorSpecBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OperatorStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OperatorStatus.java new file mode 100644 index 00000000000..08e5fe5ed28 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/OperatorStatus.java @@ -0,0 +1,182 @@ + +package io.fabric8.openshift.api.model.operator.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "conditions", + "currentVersionAvailability", + "observedGeneration", + "state", + "targetVersionAvailability", + "taskSummary" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class OperatorStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("currentVersionAvailability") + private VersionAvailability currentVersionAvailability; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("state") + private String state; + @JsonProperty("targetVersionAvailability") + private VersionAvailability targetVersionAvailability; + @JsonProperty("taskSummary") + private String taskSummary; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OperatorStatus() { + } + + public OperatorStatus(List conditions, VersionAvailability currentVersionAvailability, Long observedGeneration, String state, VersionAvailability targetVersionAvailability, String taskSummary) { + super(); + this.conditions = conditions; + this.currentVersionAvailability = currentVersionAvailability; + this.observedGeneration = observedGeneration; + this.state = state; + this.targetVersionAvailability = targetVersionAvailability; + this.taskSummary = taskSummary; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("currentVersionAvailability") + public VersionAvailability getCurrentVersionAvailability() { + return currentVersionAvailability; + } + + @JsonProperty("currentVersionAvailability") + public void setCurrentVersionAvailability(VersionAvailability currentVersionAvailability) { + this.currentVersionAvailability = currentVersionAvailability; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @JsonProperty("targetVersionAvailability") + public VersionAvailability getTargetVersionAvailability() { + return targetVersionAvailability; + } + + @JsonProperty("targetVersionAvailability") + public void setTargetVersionAvailability(VersionAvailability targetVersionAvailability) { + this.targetVersionAvailability = targetVersionAvailability; + } + + @JsonProperty("taskSummary") + public String getTaskSummary() { + return taskSummary; + } + + @JsonProperty("taskSummary") + public void setTaskSummary(String taskSummary) { + this.taskSummary = taskSummary; + } + + @JsonIgnore + public OperatorStatusBuilder edit() { + return new OperatorStatusBuilder(this); + } + + @JsonIgnore + public OperatorStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpecRepositoryDigestMirrors.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/RepositoryDigestMirrors.java similarity index 86% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpecRepositoryDigestMirrors.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/RepositoryDigestMirrors.java index 925258dbea6..42e091a7fed 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicySpecRepositoryDigestMirrors.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/RepositoryDigestMirrors.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageContentSourcePolicySpecRepositoryDigestMirrors implements Editable , KubernetesResource +public class RepositoryDigestMirrors implements Editable , KubernetesResource { @JsonProperty("mirrors") @@ -69,10 +69,10 @@ public class ImageContentSourcePolicySpecRepositoryDigestMirrors implements Edit * No args constructor for use in serialization * */ - public ImageContentSourcePolicySpecRepositoryDigestMirrors() { + public RepositoryDigestMirrors() { } - public ImageContentSourcePolicySpecRepositoryDigestMirrors(List mirrors, String source) { + public RepositoryDigestMirrors(List mirrors, String source) { super(); this.mirrors = mirrors; this.source = source; @@ -100,12 +100,12 @@ public void setSource(String source) { } @JsonIgnore - public ImageContentSourcePolicySpecRepositoryDigestMirrorsBuilder edit() { - return new ImageContentSourcePolicySpecRepositoryDigestMirrorsBuilder(this); + public RepositoryDigestMirrorsBuilder edit() { + return new RepositoryDigestMirrorsBuilder(this); } @JsonIgnore - public ImageContentSourcePolicySpecRepositoryDigestMirrorsBuilder toBuilder() { + public RepositoryDigestMirrorsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/StaticPodOperatorStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/StaticPodOperatorStatus.java new file mode 100644 index 00000000000..ef0a1a1e91e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/StaticPodOperatorStatus.java @@ -0,0 +1,212 @@ + +package io.fabric8.openshift.api.model.operator.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "conditions", + "currentVersionAvailability", + "latestAvailableDeploymentGeneration", + "nodeStatuses", + "observedGeneration", + "state", + "targetVersionAvailability", + "taskSummary" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class StaticPodOperatorStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("currentVersionAvailability") + private VersionAvailability currentVersionAvailability; + @JsonProperty("latestAvailableDeploymentGeneration") + private Integer latestAvailableDeploymentGeneration; + @JsonProperty("nodeStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List nodeStatuses = new ArrayList<>(); + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("state") + private String state; + @JsonProperty("targetVersionAvailability") + private VersionAvailability targetVersionAvailability; + @JsonProperty("taskSummary") + private String taskSummary; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StaticPodOperatorStatus() { + } + + public StaticPodOperatorStatus(List conditions, VersionAvailability currentVersionAvailability, Integer latestAvailableDeploymentGeneration, List nodeStatuses, Long observedGeneration, String state, VersionAvailability targetVersionAvailability, String taskSummary) { + super(); + this.conditions = conditions; + this.currentVersionAvailability = currentVersionAvailability; + this.latestAvailableDeploymentGeneration = latestAvailableDeploymentGeneration; + this.nodeStatuses = nodeStatuses; + this.observedGeneration = observedGeneration; + this.state = state; + this.targetVersionAvailability = targetVersionAvailability; + this.taskSummary = taskSummary; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("currentVersionAvailability") + public VersionAvailability getCurrentVersionAvailability() { + return currentVersionAvailability; + } + + @JsonProperty("currentVersionAvailability") + public void setCurrentVersionAvailability(VersionAvailability currentVersionAvailability) { + this.currentVersionAvailability = currentVersionAvailability; + } + + @JsonProperty("latestAvailableDeploymentGeneration") + public Integer getLatestAvailableDeploymentGeneration() { + return latestAvailableDeploymentGeneration; + } + + @JsonProperty("latestAvailableDeploymentGeneration") + public void setLatestAvailableDeploymentGeneration(Integer latestAvailableDeploymentGeneration) { + this.latestAvailableDeploymentGeneration = latestAvailableDeploymentGeneration; + } + + @JsonProperty("nodeStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNodeStatuses() { + return nodeStatuses; + } + + @JsonProperty("nodeStatuses") + public void setNodeStatuses(List nodeStatuses) { + this.nodeStatuses = nodeStatuses; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @JsonProperty("targetVersionAvailability") + public VersionAvailability getTargetVersionAvailability() { + return targetVersionAvailability; + } + + @JsonProperty("targetVersionAvailability") + public void setTargetVersionAvailability(VersionAvailability targetVersionAvailability) { + this.targetVersionAvailability = targetVersionAvailability; + } + + @JsonProperty("taskSummary") + public String getTaskSummary() { + return taskSummary; + } + + @JsonProperty("taskSummary") + public void setTaskSummary(String taskSummary) { + this.taskSummary = taskSummary; + } + + @JsonIgnore + public StaticPodOperatorStatusBuilder edit() { + return new StaticPodOperatorStatusBuilder(this); + } + + @JsonIgnore + public StaticPodOperatorStatusBuilder 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-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecResources.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/VersionAvailability.java similarity index 57% rename from kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecResources.java rename to kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/VersionAvailability.java index d88fa05c857..4cd6cbad6e1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/imageregistry/v1/ConfigSpecResources.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/VersionAvailability.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.operator.imageregistry.v1; +package io.fabric8.openshift.api.model.operator.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -23,7 +23,6 @@ import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceClaim; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -34,9 +33,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "claims", - "limits", - "requests" + "errors", + "generations", + "readyReplicas", + "updatedReplicas", + "version" }) @ToString @EqualsAndHashCode @@ -56,20 +57,21 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConfigSpecResources implements Editable , KubernetesResource +public class VersionAvailability implements Editable , KubernetesResource { - @JsonProperty("claims") + @JsonProperty("errors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List claims = new ArrayList<>(); - @JsonProperty("limits") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + private List errors = new ArrayList<>(); + @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map limits = new LinkedHashMap<>(); - @JsonProperty("requests") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map requests = new LinkedHashMap<>(); + private List generations = new ArrayList<>(); + @JsonProperty("readyReplicas") + private Integer readyReplicas; + @JsonProperty("updatedReplicas") + private Integer updatedReplicas; + @JsonProperty("version") + private String version; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,58 +79,77 @@ public class ConfigSpecResources implements Editable * No args constructor for use in serialization * */ - public ConfigSpecResources() { + public VersionAvailability() { } - public ConfigSpecResources(List claims, Map limits, Map requests) { + public VersionAvailability(List errors, List generations, Integer readyReplicas, Integer updatedReplicas, String version) { super(); - this.claims = claims; - this.limits = limits; - this.requests = requests; + this.errors = errors; + this.generations = generations; + this.readyReplicas = readyReplicas; + this.updatedReplicas = updatedReplicas; + this.version = version; } - @JsonProperty("claims") + @JsonProperty("errors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClaims() { - return claims; + public List getErrors() { + return errors; } - @JsonProperty("claims") - public void setClaims(List claims) { - this.claims = claims; + @JsonProperty("errors") + public void setErrors(List errors) { + this.errors = errors; } - @JsonProperty("limits") + @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getLimits() { - return limits; + public List getGenerations() { + return generations; } - @JsonProperty("limits") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setLimits(Map limits) { - this.limits = limits; + @JsonProperty("generations") + public void setGenerations(List generations) { + this.generations = generations; } - @JsonProperty("requests") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getRequests() { - return requests; + @JsonProperty("readyReplicas") + public Integer getReadyReplicas() { + return readyReplicas; + } + + @JsonProperty("readyReplicas") + public void setReadyReplicas(Integer readyReplicas) { + this.readyReplicas = readyReplicas; + } + + @JsonProperty("updatedReplicas") + public Integer getUpdatedReplicas() { + return updatedReplicas; + } + + @JsonProperty("updatedReplicas") + public void setUpdatedReplicas(Integer updatedReplicas) { + this.updatedReplicas = updatedReplicas; + } + + @JsonProperty("version") + public String getVersion() { + return version; } - @JsonProperty("requests") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setRequests(Map requests) { - this.requests = requests; + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; } @JsonIgnore - public ConfigSpecResourcesBuilder edit() { - return new ConfigSpecResourcesBuilder(this); + public VersionAvailabilityBuilder edit() { + return new VersionAvailabilityBuilder(this); } @JsonIgnore - public ConfigSpecResourcesBuilder toBuilder() { + public VersionAvailabilityBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java index b73654b40d6..4fab6875995 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java @@ -13,8 +13,8 @@ import com.fasterxml.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; @@ -38,6 +38,7 @@ @JsonPropertyOrder({ "apiVersion", "kind", + "metadata", "content", "isNonResourceURL", "namespace", @@ -71,7 +72,7 @@ @Version("v1") @Group("authorization.openshift.io") @Generated("jsonschema2pojo") -public class LocalResourceAccessReview implements Editable , KubernetesResource, Namespaced +public class LocalResourceAccessReview implements Editable , HasMetadata, Namespaced { /** @@ -93,6 +94,8 @@ public class LocalResourceAccessReview implements Editable , KubernetesResource, Namespaced +public class LocalSubjectAccessReview implements Editable , HasMetadata, Namespaced { /** @@ -101,6 +102,8 @@ public class LocalSubjectAccessReview implements Editable groups, Boolean isNonResourceURL, String kind, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { + public LocalSubjectAccessReview(String apiVersion, Object content, List groups, Boolean isNonResourceURL, String kind, ObjectMeta metadata, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { super(); this.apiVersion = apiVersion; this.content = content; this.groups = groups; this.isNonResourceURL = isNonResourceURL; this.kind = kind; + this.metadata = metadata; this.namespace = namespace; this.path = path; this.resource = resource; @@ -220,6 +224,16 @@ 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("namespace") public String getNamespace() { return namespace; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java index cf12cfaf2a5..67e3e513615 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java @@ -13,8 +13,8 @@ import com.fasterxml.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; @@ -38,6 +38,7 @@ @JsonPropertyOrder({ "apiVersion", "kind", + "metadata", "spec", "status" }) @@ -64,7 +65,7 @@ @Version("v1") @Group("security.openshift.io") @Generated("jsonschema2pojo") -public class PodSecurityPolicyReview implements Editable , KubernetesResource, Namespaced +public class PodSecurityPolicyReview implements Editable , HasMetadata, Namespaced { /** @@ -81,6 +82,8 @@ public class PodSecurityPolicyReview implements Editable , KubernetesResource, Namespaced +public class PodSecurityPolicySelfSubjectReview implements Editable , HasMetadata, Namespaced { /** @@ -81,6 +82,8 @@ public class PodSecurityPolicySelfSubjectReview implements Editable , KubernetesResource, Namespaced +public class PodSecurityPolicySubjectReview implements Editable , HasMetadata, Namespaced { /** @@ -81,6 +82,8 @@ public class PodSecurityPolicySubjectReview implements Editable , KubernetesResource +public class ResourceAccessReview implements Editable , HasMetadata { /** @@ -92,6 +93,8 @@ public class ResourceAccessReview implements Editable seccompProfiles = new ArrayList<>(); @JsonProperty("supplementalGroups") private SupplementalGroupsStrategyOptions supplementalGroups; + @JsonProperty("userNamespaceLevel") + private String userNamespaceLevel; @JsonProperty("users") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List users = new ArrayList<>(); @@ -175,7 +178,7 @@ public class SecurityContextConstraints implements Editable allowedCapabilities, List allowedFlexVolumes, List allowedUnsafeSysctls, String apiVersion, List defaultAddCapabilities, Boolean defaultAllowPrivilegeEscalation, List forbiddenSysctls, FSGroupStrategyOptions fsGroup, List groups, String kind, ObjectMeta metadata, Integer priority, Boolean readOnlyRootFilesystem, List requiredDropCapabilities, RunAsUserStrategyOptions runAsUser, SELinuxContextStrategyOptions seLinuxContext, List seccompProfiles, SupplementalGroupsStrategyOptions supplementalGroups, List users, List volumes) { + public SecurityContextConstraints(Boolean allowHostDirVolumePlugin, Boolean allowHostIPC, Boolean allowHostNetwork, Boolean allowHostPID, Boolean allowHostPorts, Boolean allowPrivilegeEscalation, Boolean allowPrivilegedContainer, List allowedCapabilities, List allowedFlexVolumes, List allowedUnsafeSysctls, String apiVersion, List defaultAddCapabilities, Boolean defaultAllowPrivilegeEscalation, List forbiddenSysctls, FSGroupStrategyOptions fsGroup, List groups, String kind, ObjectMeta metadata, Integer priority, Boolean readOnlyRootFilesystem, List requiredDropCapabilities, RunAsUserStrategyOptions runAsUser, SELinuxContextStrategyOptions seLinuxContext, List seccompProfiles, SupplementalGroupsStrategyOptions supplementalGroups, String userNamespaceLevel, List users, List volumes) { super(); this.allowHostDirVolumePlugin = allowHostDirVolumePlugin; this.allowHostIPC = allowHostIPC; @@ -202,6 +205,7 @@ public SecurityContextConstraints(Boolean allowHostDirVolumePlugin, Boolean allo this.seLinuxContext = seLinuxContext; this.seccompProfiles = seccompProfiles; this.supplementalGroups = supplementalGroups; + this.userNamespaceLevel = userNamespaceLevel; this.users = users; this.volumes = volumes; } @@ -484,6 +488,16 @@ public void setSupplementalGroups(SupplementalGroupsStrategyOptions supplemental this.supplementalGroups = supplementalGroups; } + @JsonProperty("userNamespaceLevel") + public String getUserNamespaceLevel() { + return userNamespaceLevel; + } + + @JsonProperty("userNamespaceLevel") + public void setUserNamespaceLevel(String userNamespaceLevel) { + this.userNamespaceLevel = userNamespaceLevel; + } + @JsonProperty("users") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getUsers() { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java index 85d4d46a5ba..6597052ab65 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java @@ -13,8 +13,8 @@ import com.fasterxml.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; @@ -38,6 +38,7 @@ @JsonPropertyOrder({ "apiVersion", "kind", + "metadata", "spec", "status" }) @@ -64,7 +65,7 @@ @Version("v1") @Group("authorization.openshift.io") @Generated("jsonschema2pojo") -public class SelfSubjectRulesReview implements Editable , KubernetesResource, Namespaced +public class SelfSubjectRulesReview implements Editable , HasMetadata, Namespaced { /** @@ -81,6 +82,8 @@ public class SelfSubjectRulesReview implements Editable , KubernetesResource +public class SubjectAccessReview implements Editable , HasMetadata { /** @@ -100,6 +101,8 @@ public class SubjectAccessReview implements Editable */ @JsonProperty("kind") private String kind = "SubjectAccessReview"; + @JsonProperty("metadata") + private ObjectMeta metadata; @JsonProperty("namespace") private String namespace; @JsonProperty("path") @@ -129,13 +132,14 @@ public class SubjectAccessReview implements Editable public SubjectAccessReview() { } - public SubjectAccessReview(String apiVersion, Object content, List groups, Boolean isNonResourceURL, String kind, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { + public SubjectAccessReview(String apiVersion, Object content, List groups, Boolean isNonResourceURL, String kind, ObjectMeta metadata, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { super(); this.apiVersion = apiVersion; this.content = content; this.groups = groups; this.isNonResourceURL = isNonResourceURL; this.kind = kind; + this.metadata = metadata; this.namespace = namespace; this.path = path; this.resource = resource; @@ -219,6 +223,16 @@ 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("namespace") public String getNamespace() { return namespace; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java index 2574b6b8a09..8dccf4eba66 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java @@ -13,8 +13,8 @@ import com.fasterxml.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; @@ -38,6 +38,7 @@ @JsonPropertyOrder({ "apiVersion", "kind", + "metadata", "spec", "status" }) @@ -64,7 +65,7 @@ @Version("v1") @Group("authorization.openshift.io") @Generated("jsonschema2pojo") -public class SubjectRulesReview implements Editable , KubernetesResource, Namespaced +public class SubjectRulesReview implements Editable , HasMetadata, Namespaced { /** @@ -81,6 +82,8 @@ public class SubjectRulesReview implements Editable , */ @JsonProperty("kind") private String kind = "SubjectRulesReview"; + @JsonProperty("metadata") + private ObjectMeta metadata; @JsonProperty("spec") private SubjectRulesReviewSpec spec; @JsonProperty("status") @@ -95,10 +98,11 @@ public class SubjectRulesReview implements Editable , public SubjectRulesReview() { } - public SubjectRulesReview(String apiVersion, String kind, SubjectRulesReviewSpec spec, SubjectRulesReviewStatus status) { + public SubjectRulesReview(String apiVersion, String kind, ObjectMeta metadata, SubjectRulesReviewSpec spec, SubjectRulesReviewStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; + this.metadata = metadata; this.spec = spec; this.status = status; } @@ -143,6 +147,16 @@ public void setKind(String kind) { this.kind = kind; } + @JsonProperty("metadata") + public ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + @JsonProperty("spec") public SubjectRulesReviewSpec getSpec() { return spec;