diff --git a/pkg/api/types.go b/pkg/api/types.go index fb3becbea..dd74c94ff 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -52,8 +52,8 @@ type Namespaces struct { } // Besides Namespaces only one of its members may be specified -// TODO(jchaloup): move Namespaces to individual strategies once the policy -// version is bumped to v1alpha2 +// TODO(jchaloup): move Namespaces ThresholdPriority and ThresholdPriorityClassName to individual strategies +// once the policy version is bumped to v1alpha2 type StrategyParameters struct { NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds NodeAffinityType []string @@ -61,6 +61,8 @@ type StrategyParameters struct { MaxPodLifeTimeSeconds *uint RemoveDuplicates *RemoveDuplicates Namespaces Namespaces + ThresholdPriority *int32 + ThresholdPriorityClassName string } type Percentage float64 diff --git a/pkg/api/v1alpha1/types.go b/pkg/api/v1alpha1/types.go index aa1f60c8d..d672d9bea 100644 --- a/pkg/api/v1alpha1/types.go +++ b/pkg/api/v1alpha1/types.go @@ -51,7 +51,7 @@ type Namespaces struct { Exclude []string `json:"exclude"` } -// Besides Namespaces only one of its members may be specified +// Besides Namespaces ThresholdPriority and ThresholdPriorityClassName only one of its members may be specified type StrategyParameters struct { NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds `json:"nodeResourceUtilizationThresholds,omitempty"` NodeAffinityType []string `json:"nodeAffinityType,omitempty"` @@ -59,6 +59,8 @@ type StrategyParameters struct { MaxPodLifeTimeSeconds *uint `json:"maxPodLifeTimeSeconds,omitempty"` RemoveDuplicates *RemoveDuplicates `json:"removeDuplicates,omitempty"` Namespaces Namespaces `json:"namespaces"` + ThresholdPriority *int32 `json:"thresholdPriority"` + ThresholdPriorityClassName string `json:"thresholdPriorityClassName"` } type Percentage float64 diff --git a/pkg/api/v1alpha1/zz_generated.conversion.go b/pkg/api/v1alpha1/zz_generated.conversion.go index d2a58a2eb..e0f0cfc77 100644 --- a/pkg/api/v1alpha1/zz_generated.conversion.go +++ b/pkg/api/v1alpha1/zz_generated.conversion.go @@ -249,6 +249,8 @@ func autoConvert_v1alpha1_StrategyParameters_To_api_StrategyParameters(in *Strat if err := Convert_v1alpha1_Namespaces_To_api_Namespaces(&in.Namespaces, &out.Namespaces, s); err != nil { return err } + out.ThresholdPriority = (*int32)(unsafe.Pointer(in.ThresholdPriority)) + out.ThresholdPriorityClassName = in.ThresholdPriorityClassName return nil } @@ -266,6 +268,8 @@ func autoConvert_api_StrategyParameters_To_v1alpha1_StrategyParameters(in *api.S if err := Convert_api_Namespaces_To_v1alpha1_Namespaces(&in.Namespaces, &out.Namespaces, s); err != nil { return err } + out.ThresholdPriority = (*int32)(unsafe.Pointer(in.ThresholdPriority)) + out.ThresholdPriorityClassName = in.ThresholdPriorityClassName return nil } diff --git a/pkg/api/v1alpha1/zz_generated.deepcopy.go b/pkg/api/v1alpha1/zz_generated.deepcopy.go index f9707bb1d..33321a5cd 100644 --- a/pkg/api/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/api/v1alpha1/zz_generated.deepcopy.go @@ -243,6 +243,11 @@ func (in *StrategyParameters) DeepCopyInto(out *StrategyParameters) { (*in).DeepCopyInto(*out) } in.Namespaces.DeepCopyInto(&out.Namespaces) + if in.ThresholdPriority != nil { + in, out := &in.ThresholdPriority, &out.ThresholdPriority + *out = new(int32) + **out = **in + } return } diff --git a/pkg/api/zz_generated.deepcopy.go b/pkg/api/zz_generated.deepcopy.go index b8d8dc574..b337e6ae6 100644 --- a/pkg/api/zz_generated.deepcopy.go +++ b/pkg/api/zz_generated.deepcopy.go @@ -243,6 +243,11 @@ func (in *StrategyParameters) DeepCopyInto(out *StrategyParameters) { (*in).DeepCopyInto(*out) } in.Namespaces.DeepCopyInto(&out.Namespaces) + if in.ThresholdPriority != nil { + in, out := &in.ThresholdPriority, &out.ThresholdPriority + *out = new(int32) + **out = **in + } return }