mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 02:41:25 +00:00
add patch annotations to flowcontrol v1beta3
This commit is contained in:
parent
6dc81c3280
commit
f4f363fbe4
8
api/openapi-spec/swagger.json
generated
8
api/openapi-spec/swagger.json
generated
@ -10585,7 +10585,9 @@
|
|||||||
"x-kubernetes-list-map-keys": [
|
"x-kubernetes-list-map-keys": [
|
||||||
"type"
|
"type"
|
||||||
],
|
],
|
||||||
"x-kubernetes-list-type": "map"
|
"x-kubernetes-list-type": "map",
|
||||||
|
"x-kubernetes-patch-merge-key": "type",
|
||||||
|
"x-kubernetes-patch-strategy": "merge"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
@ -10846,7 +10848,9 @@
|
|||||||
"x-kubernetes-list-map-keys": [
|
"x-kubernetes-list-map-keys": [
|
||||||
"type"
|
"type"
|
||||||
],
|
],
|
||||||
"x-kubernetes-list-type": "map"
|
"x-kubernetes-list-type": "map",
|
||||||
|
"x-kubernetes-patch-merge-key": "type",
|
||||||
|
"x-kubernetes-patch-strategy": "merge"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
@ -201,7 +201,9 @@
|
|||||||
"x-kubernetes-list-map-keys": [
|
"x-kubernetes-list-map-keys": [
|
||||||
"type"
|
"type"
|
||||||
],
|
],
|
||||||
"x-kubernetes-list-type": "map"
|
"x-kubernetes-list-type": "map",
|
||||||
|
"x-kubernetes-patch-merge-key": "type",
|
||||||
|
"x-kubernetes-patch-strategy": "merge"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
@ -532,7 +534,9 @@
|
|||||||
"x-kubernetes-list-map-keys": [
|
"x-kubernetes-list-map-keys": [
|
||||||
"type"
|
"type"
|
||||||
],
|
],
|
||||||
"x-kubernetes-list-type": "map"
|
"x-kubernetes-list-type": "map",
|
||||||
|
"x-kubernetes-patch-merge-key": "type",
|
||||||
|
"x-kubernetes-patch-strategy": "merge"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
@ -298,6 +298,8 @@ type FlowSchemaStatus struct {
|
|||||||
// `conditions` is a list of the current states of FlowSchema.
|
// `conditions` is a list of the current states of FlowSchema.
|
||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
|
// +patchMergeKey=type
|
||||||
|
// +patchStrategy=merge
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []FlowSchemaCondition
|
Conditions []FlowSchemaCondition
|
||||||
}
|
}
|
||||||
@ -488,6 +490,8 @@ type PriorityLevelConfigurationStatus struct {
|
|||||||
// `conditions` is the current state of "request-priority".
|
// `conditions` is the current state of "request-priority".
|
||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
|
// +patchMergeKey=type
|
||||||
|
// +patchStrategy=merge
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []PriorityLevelConfigurationCondition
|
Conditions []PriorityLevelConfigurationCondition
|
||||||
}
|
}
|
||||||
|
4
pkg/generated/openapi/zz_generated.openapi.go
generated
4
pkg/generated/openapi/zz_generated.openapi.go
generated
@ -33503,6 +33503,8 @@ func schema_k8sio_api_flowcontrol_v1beta3_FlowSchemaStatus(ref common.ReferenceC
|
|||||||
"type",
|
"type",
|
||||||
},
|
},
|
||||||
"x-kubernetes-list-type": "map",
|
"x-kubernetes-list-type": "map",
|
||||||
|
"x-kubernetes-patch-merge-key": "type",
|
||||||
|
"x-kubernetes-patch-strategy": "merge",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
SchemaProps: spec.SchemaProps{
|
SchemaProps: spec.SchemaProps{
|
||||||
@ -33976,6 +33978,8 @@ func schema_k8sio_api_flowcontrol_v1beta3_PriorityLevelConfigurationStatus(ref c
|
|||||||
"type",
|
"type",
|
||||||
},
|
},
|
||||||
"x-kubernetes-list-type": "map",
|
"x-kubernetes-list-type": "map",
|
||||||
|
"x-kubernetes-patch-merge-key": "type",
|
||||||
|
"x-kubernetes-patch-strategy": "merge",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
SchemaProps: spec.SchemaProps{
|
SchemaProps: spec.SchemaProps{
|
||||||
|
@ -119,6 +119,8 @@ message FlowSchemaStatus {
|
|||||||
// `conditions` is a list of the current states of FlowSchema.
|
// `conditions` is a list of the current states of FlowSchema.
|
||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
|
// +patchMergeKey=type
|
||||||
|
// +patchStrategy=merge
|
||||||
// +optional
|
// +optional
|
||||||
repeated FlowSchemaCondition conditions = 1;
|
repeated FlowSchemaCondition conditions = 1;
|
||||||
}
|
}
|
||||||
@ -310,6 +312,8 @@ message PriorityLevelConfigurationStatus {
|
|||||||
// `conditions` is the current state of "request-priority".
|
// `conditions` is the current state of "request-priority".
|
||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
|
// +patchMergeKey=type
|
||||||
|
// +patchStrategy=merge
|
||||||
// +optional
|
// +optional
|
||||||
repeated PriorityLevelConfigurationCondition conditions = 1;
|
repeated PriorityLevelConfigurationCondition conditions = 1;
|
||||||
}
|
}
|
||||||
|
@ -352,8 +352,10 @@ type FlowSchemaStatus struct {
|
|||||||
// `conditions` is a list of the current states of FlowSchema.
|
// `conditions` is a list of the current states of FlowSchema.
|
||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
|
// +patchMergeKey=type
|
||||||
|
// +patchStrategy=merge
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []FlowSchemaCondition `json:"conditions,omitempty" protobuf:"bytes,1,rep,name=conditions"`
|
Conditions []FlowSchemaCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// FlowSchemaCondition describes conditions for a FlowSchema.
|
// FlowSchemaCondition describes conditions for a FlowSchema.
|
||||||
@ -544,8 +546,10 @@ type PriorityLevelConfigurationStatus struct {
|
|||||||
// `conditions` is the current state of "request-priority".
|
// `conditions` is the current state of "request-priority".
|
||||||
// +listType=map
|
// +listType=map
|
||||||
// +listMapKey=type
|
// +listMapKey=type
|
||||||
|
// +patchMergeKey=type
|
||||||
|
// +patchStrategy=merge
|
||||||
// +optional
|
// +optional
|
||||||
Conditions []PriorityLevelConfigurationCondition `json:"conditions,omitempty" protobuf:"bytes,1,rep,name=conditions"`
|
Conditions []PriorityLevelConfigurationCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// PriorityLevelConfigurationCondition defines the condition of priority level.
|
// PriorityLevelConfigurationCondition defines the condition of priority level.
|
||||||
|
Loading…
Reference in New Issue
Block a user