Merge pull request #49530 from dixudx/pod_affinity_legacy_todo
Automatic merge from submit-queue add newline for unimplemented RequiredDuringSchedulingRequiredDuringExecution **What this PR does / why we need it**: Unimplemented `RequiredDuringSchedulingRequiredDuringExecution` should not be treated as comments of `RequiredDuringSchedulingIgnoredDuringExecution` * [pkg/api/types.go#L1937](https://github.com/kubernetes/kubernetes/blob/master/pkg/api/types.go#L1937) * [staging/src/k8s.io/api/core/v1/types.go#L2155](https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/api/core/v1/types.go#L2155) > // NOT YET IMPLEMENTED. TODO: Uncomment field once it is implemented. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*:fixes #50483 **Special notes for your reviewer**: * Add an empty line to separate them. /cc @aveshagarwal @bsalamat @gyliu513 @k82cn @timothysc **Release note**: ```release-note None ```
This commit is contained in:
@@ -1950,6 +1950,7 @@ type PodAffinity struct {
|
||||
// podAffinityTerm are intersected, i.e. all terms must be satisfied.
|
||||
// +optional
|
||||
// RequiredDuringSchedulingRequiredDuringExecution []PodAffinityTerm
|
||||
|
||||
// If the affinity requirements specified by this field are not met at
|
||||
// scheduling time, the pod will not be scheduled onto the node.
|
||||
// If the affinity requirements specified by this field cease to be met
|
||||
@@ -1984,6 +1985,7 @@ type PodAntiAffinity struct {
|
||||
// podAffinityTerm are intersected, i.e. all terms must be satisfied.
|
||||
// +optional
|
||||
// RequiredDuringSchedulingRequiredDuringExecution []PodAffinityTerm
|
||||
|
||||
// If the anti-affinity requirements specified by this field are not met at
|
||||
// scheduling time, the pod will not be scheduled onto the node.
|
||||
// If the anti-affinity requirements specified by this field cease to be met
|
||||
|
Reference in New Issue
Block a user