mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-13 22:05:59 +00:00
Merge pull request #120204 from mimowo/make-onpodconditions-optional
Mark Job onPodConditions as optional in pod failure policy
This commit is contained in:
commit
a3374795e4
3
api/openapi-spec/swagger.json
generated
3
api/openapi-spec/swagger.json
generated
@ -4455,8 +4455,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
"action",
|
"action"
|
||||||
"onPodConditions"
|
|
||||||
],
|
],
|
||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
|
@ -608,8 +608,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
"action",
|
"action"
|
||||||
"onPodConditions"
|
|
||||||
],
|
],
|
||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
|
@ -241,6 +241,7 @@ type PodFailurePolicyRule struct {
|
|||||||
// as a list of pod condition patterns. The requirement is satisfied if at
|
// as a list of pod condition patterns. The requirement is satisfied if at
|
||||||
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
|
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
|
||||||
// +listType=atomic
|
// +listType=atomic
|
||||||
|
// +optional
|
||||||
OnPodConditions []PodFailurePolicyOnPodConditionsPattern
|
OnPodConditions []PodFailurePolicyOnPodConditionsPattern
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
pkg/generated/openapi/zz_generated.openapi.go
generated
2
pkg/generated/openapi/zz_generated.openapi.go
generated
@ -15915,7 +15915,7 @@ func schema_k8sio_api_batch_v1_PodFailurePolicyRule(ref common.ReferenceCallback
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Required: []string{"action", "onPodConditions"},
|
Required: []string{"action"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Dependencies: []string{
|
Dependencies: []string{
|
||||||
|
@ -530,6 +530,7 @@ message PodFailurePolicyRule {
|
|||||||
// as a list of pod condition patterns. The requirement is satisfied if at
|
// as a list of pod condition patterns. The requirement is satisfied if at
|
||||||
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
|
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
|
||||||
// +listType=atomic
|
// +listType=atomic
|
||||||
|
// +optional
|
||||||
repeated PodFailurePolicyOnPodConditionsPattern onPodConditions = 3;
|
repeated PodFailurePolicyOnPodConditionsPattern onPodConditions = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -236,6 +236,7 @@ type PodFailurePolicyRule struct {
|
|||||||
// as a list of pod condition patterns. The requirement is satisfied if at
|
// as a list of pod condition patterns. The requirement is satisfied if at
|
||||||
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
|
// least one pattern matches an actual pod condition. At most 20 elements are allowed.
|
||||||
// +listType=atomic
|
// +listType=atomic
|
||||||
|
// +optional
|
||||||
OnPodConditions []PodFailurePolicyOnPodConditionsPattern `json:"onPodConditions" protobuf:"bytes,3,opt,name=onPodConditions"`
|
OnPodConditions []PodFailurePolicyOnPodConditionsPattern `json:"onPodConditions" protobuf:"bytes,3,opt,name=onPodConditions"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user