Skip to content

Commit a34ea3f

Browse files
author
Yann Hamon
committed
Adding new schemas
1 parent df2d89c commit a34ea3f

File tree

154 files changed

+11552
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+11552
-144
lines changed

‎master-local/_definitions.json

+575
Large diffs are not rendered by default.

‎master-local/all.json

+66
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,72 @@
10321032
{
10331033
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.UserSubject"
10341034
},
1035+
{
1036+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowDistinguisherMethod"
1037+
},
1038+
{
1039+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchema"
1040+
},
1041+
{
1042+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaCondition"
1043+
},
1044+
{
1045+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaList"
1046+
},
1047+
{
1048+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaSpec"
1049+
},
1050+
{
1051+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaStatus"
1052+
},
1053+
{
1054+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.GroupSubject"
1055+
},
1056+
{
1057+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.LimitResponse"
1058+
},
1059+
{
1060+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.LimitedPriorityLevelConfiguration"
1061+
},
1062+
{
1063+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.NonResourcePolicyRule"
1064+
},
1065+
{
1066+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PolicyRulesWithSubjects"
1067+
},
1068+
{
1069+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfiguration"
1070+
},
1071+
{
1072+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationCondition"
1073+
},
1074+
{
1075+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationList"
1076+
},
1077+
{
1078+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationReference"
1079+
},
1080+
{
1081+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationSpec"
1082+
},
1083+
{
1084+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationStatus"
1085+
},
1086+
{
1087+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.QueuingConfiguration"
1088+
},
1089+
{
1090+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.ResourcePolicyRule"
1091+
},
1092+
{
1093+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.ServiceAccountSubject"
1094+
},
1095+
{
1096+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.Subject"
1097+
},
1098+
{
1099+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.UserSubject"
1100+
},
10351101
{
10361102
"$ref": "_definitions.json#/definitions/io.k8s.api.networking.v1.HTTPIngressPath"
10371103
},

‎master-local/deleteoptions-meta-v1.json

+6
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"flowcontrol.apiserver.k8s.io/v1alpha1",
4444
"flowcontrol.apiserver.k8s.io/v1beta1",
4545
"flowcontrol.apiserver.k8s.io/v1beta2",
46+
"flowcontrol.apiserver.k8s.io/v1beta3",
4647
"imagepolicy.k8s.io/v1alpha1",
4748
"internal.apiserver.k8s.io/v1alpha1",
4849
"networking.k8s.io/v1",
@@ -291,6 +292,11 @@
291292
"kind": "DeleteOptions",
292293
"version": "v1beta2"
293294
},
295+
{
296+
"group": "flowcontrol.apiserver.k8s.io",
297+
"kind": "DeleteOptions",
298+
"version": "v1beta3"
299+
},
294300
{
295301
"group": "imagepolicy.k8s.io",
296302
"kind": "DeleteOptions",

‎master-local/deleteoptions.json

+5
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,11 @@
235235
"kind": "DeleteOptions",
236236
"version": "v1beta2"
237237
},
238+
{
239+
"group": "flowcontrol.apiserver.k8s.io",
240+
"kind": "DeleteOptions",
241+
"version": "v1beta3"
242+
},
238243
{
239244
"group": "imagepolicy.k8s.io",
240245
"kind": "DeleteOptions",

‎master-local/flowdistinguishermethod-flowcontrol-v1beta3.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"description": "FlowDistinguisherMethod specifies the method of a flow distinguisher.",
3+
"properties": {
4+
"type": {
5+
"description": "`type` is the type of flow distinguisher method The supported types are \"ByUser\" and \"ByNamespace\". Required.",
6+
"type": [
7+
"string",
8+
"null"
9+
]
10+
}
11+
},
12+
"required": [
13+
"type"
14+
],
15+
"type": "object",
16+
"$schema": "http://json-schema.org/schema#"
17+
}

‎master-local/flowschema-flowcontrol-v1beta3.json

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"description": "FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with similar attributes and is identified by a pair of strings: the name of the FlowSchema and a \"flow distinguisher\".",
3+
"properties": {
4+
"apiVersion": {
5+
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
6+
"type": [
7+
"string",
8+
"null"
9+
],
10+
"enum": [
11+
"flowcontrol.apiserver.k8s.io/v1beta3"
12+
]
13+
},
14+
"kind": {
15+
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
16+
"type": [
17+
"string",
18+
"null"
19+
],
20+
"enum": [
21+
"FlowSchema"
22+
]
23+
},
24+
"metadata": {
25+
"$ref": "_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta",
26+
"description": "`metadata` is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata"
27+
},
28+
"spec": {
29+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaSpec",
30+
"description": "`spec` is the specification of the desired behavior of a FlowSchema. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
31+
},
32+
"status": {
33+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaStatus",
34+
"description": "`status` is the current status of a FlowSchema. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
35+
}
36+
},
37+
"type": "object",
38+
"x-kubernetes-group-version-kind": [
39+
{
40+
"group": "flowcontrol.apiserver.k8s.io",
41+
"kind": "FlowSchema",
42+
"version": "v1beta3"
43+
}
44+
],
45+
"$schema": "http://json-schema.org/schema#"
46+
}

‎master-local/flowschema.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"description": "`metadata` is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata"
2424
},
2525
"spec": {
26-
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.FlowSchemaSpec",
26+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaSpec",
2727
"description": "`spec` is the specification of the desired behavior of a FlowSchema. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
2828
},
2929
"status": {
30-
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.FlowSchemaStatus",
30+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaStatus",
3131
"description": "`status` is the current status of a FlowSchema. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
3232
}
3333
},
@@ -36,7 +36,7 @@
3636
{
3737
"group": "flowcontrol.apiserver.k8s.io",
3838
"kind": "FlowSchema",
39-
"version": "v1beta2"
39+
"version": "v1beta3"
4040
}
4141
],
4242
"$schema": "http://json-schema.org/schema#"

‎master-local/flowschemacondition-flowcontrol-v1beta3.json

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"description": "FlowSchemaCondition describes conditions for a FlowSchema.",
3+
"properties": {
4+
"lastTransitionTime": {
5+
"$ref": "_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Time",
6+
"description": "`lastTransitionTime` is the last time the condition transitioned from one status to another."
7+
},
8+
"message": {
9+
"description": "`message` is a human-readable message indicating details about last transition.",
10+
"type": [
11+
"string",
12+
"null"
13+
]
14+
},
15+
"reason": {
16+
"description": "`reason` is a unique, one-word, CamelCase reason for the condition's last transition.",
17+
"type": [
18+
"string",
19+
"null"
20+
]
21+
},
22+
"status": {
23+
"description": "`status` is the status of the condition. Can be True, False, Unknown. Required.",
24+
"type": [
25+
"string",
26+
"null"
27+
]
28+
},
29+
"type": {
30+
"description": "`type` is the type of the condition. Required.",
31+
"type": [
32+
"string",
33+
"null"
34+
]
35+
}
36+
},
37+
"type": "object",
38+
"$schema": "http://json-schema.org/schema#"
39+
}

‎master-local/flowschemalist-flowcontrol-v1beta3.json

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"description": "FlowSchemaList is a list of FlowSchema objects.",
3+
"properties": {
4+
"apiVersion": {
5+
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
6+
"type": [
7+
"string",
8+
"null"
9+
],
10+
"enum": [
11+
"flowcontrol.apiserver.k8s.io/v1beta3"
12+
]
13+
},
14+
"items": {
15+
"description": "`items` is a list of FlowSchemas.",
16+
"items": {
17+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchema"
18+
},
19+
"type": [
20+
"array",
21+
"null"
22+
]
23+
},
24+
"kind": {
25+
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
26+
"type": [
27+
"string",
28+
"null"
29+
],
30+
"enum": [
31+
"FlowSchemaList"
32+
]
33+
},
34+
"metadata": {
35+
"$ref": "_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta",
36+
"description": "`metadata` is the standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata"
37+
}
38+
},
39+
"required": [
40+
"items"
41+
],
42+
"type": "object",
43+
"x-kubernetes-group-version-kind": [
44+
{
45+
"group": "flowcontrol.apiserver.k8s.io",
46+
"kind": "FlowSchemaList",
47+
"version": "v1beta3"
48+
}
49+
],
50+
"$schema": "http://json-schema.org/schema#"
51+
}

‎master-local/flowschemalist.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": {
1212
"description": "`items` is a list of FlowSchemas.",
1313
"items": {
14-
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.FlowSchema"
14+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchema"
1515
},
1616
"type": [
1717
"array",
@@ -41,7 +41,7 @@
4141
{
4242
"group": "flowcontrol.apiserver.k8s.io",
4343
"kind": "FlowSchemaList",
44-
"version": "v1beta2"
44+
"version": "v1beta3"
4545
}
4646
],
4747
"$schema": "http://json-schema.org/schema#"

‎master-local/flowschemaspec-flowcontrol-v1beta3.json

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"description": "FlowSchemaSpec describes how the FlowSchema's specification looks like.",
3+
"properties": {
4+
"distinguisherMethod": {
5+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowDistinguisherMethod",
6+
"description": "`distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema. `nil` specifies that the distinguisher is disabled and thus will always be the empty string."
7+
},
8+
"matchingPrecedence": {
9+
"description": "`matchingPrecedence` is used to choose among the FlowSchemas that match a given request. The chosen FlowSchema is among those with the numerically lowest (which we take to be logically highest) MatchingPrecedence. Each MatchingPrecedence value must be ranged in [1,10000]. Note that if the precedence is not specified, it will be set to 1000 as default.",
10+
"format": "int32",
11+
"type": [
12+
"integer",
13+
"null"
14+
]
15+
},
16+
"priorityLevelConfiguration": {
17+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationReference",
18+
"description": "`priorityLevelConfiguration` should reference a PriorityLevelConfiguration in the cluster. If the reference cannot be resolved, the FlowSchema will be ignored and marked as invalid in its status. Required."
19+
},
20+
"rules": {
21+
"description": "`rules` describes which requests will match this flow schema. This FlowSchema matches a request if and only if at least one member of rules matches the request. if it is an empty slice, there will be no requests matching the FlowSchema.",
22+
"items": {
23+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PolicyRulesWithSubjects"
24+
},
25+
"type": [
26+
"array",
27+
"null"
28+
],
29+
"x-kubernetes-list-type": "atomic"
30+
}
31+
},
32+
"required": [
33+
"priorityLevelConfiguration"
34+
],
35+
"type": "object",
36+
"$schema": "http://json-schema.org/schema#"
37+
}

‎master-local/flowschemaspec.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"description": "FlowSchemaSpec describes how the FlowSchema's specification looks like.",
33
"properties": {
44
"distinguisherMethod": {
5-
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.FlowDistinguisherMethod",
5+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowDistinguisherMethod",
66
"description": "`distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema. `nil` specifies that the distinguisher is disabled and thus will always be the empty string."
77
},
88
"matchingPrecedence": {
@@ -14,13 +14,13 @@
1414
]
1515
},
1616
"priorityLevelConfiguration": {
17-
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.PriorityLevelConfigurationReference",
17+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PriorityLevelConfigurationReference",
1818
"description": "`priorityLevelConfiguration` should reference a PriorityLevelConfiguration in the cluster. If the reference cannot be resolved, the FlowSchema will be ignored and marked as invalid in its status. Required."
1919
},
2020
"rules": {
2121
"description": "`rules` describes which requests will match this flow schema. This FlowSchema matches a request if and only if at least one member of rules matches the request. if it is an empty slice, there will be no requests matching the FlowSchema.",
2222
"items": {
23-
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta2.PolicyRulesWithSubjects"
23+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.PolicyRulesWithSubjects"
2424
},
2525
"type": [
2626
"array",

‎master-local/flowschemastatus-flowcontrol-v1beta3.json

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"description": "FlowSchemaStatus represents the current state of a FlowSchema.",
3+
"properties": {
4+
"conditions": {
5+
"description": "`conditions` is a list of the current states of FlowSchema.",
6+
"items": {
7+
"$ref": "_definitions.json#/definitions/io.k8s.api.flowcontrol.v1beta3.FlowSchemaCondition"
8+
},
9+
"type": [
10+
"array",
11+
"null"
12+
],
13+
"x-kubernetes-list-map-keys": [
14+
"type"
15+
],
16+
"x-kubernetes-list-type": "map",
17+
"x-kubernetes-patch-merge-key": "type",
18+
"x-kubernetes-patch-strategy": "merge"
19+
}
20+
},
21+
"type": "object",
22+
"$schema": "http://json-schema.org/schema#"
23+
}

0 commit comments

Comments
 (0)