github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55103 from ConnorDoyle/remove-oir

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 55103, 56036, 56186). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Removed opaque integer resources (deprecated in v1.8)

**What this PR does / why we need it**:

* Remove opaque integer resources (OIR) support from the code base. This feature was deprecated in v1.8 and replaced by Extended Resources (ER).

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #55102

**Release note**:

```release-note
Remove opaque integer resources (OIR) support (deprecated in v1.8.)
```
This commit is contained in:
Kubernetes Submit Queue
2017-11-22 00:27:27 -08:00
committed by GitHub
parent b18d86d5cc 80ac705ef3
commit 2a18a2aadf
14 changed files with 131 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/apis/core/validation/validation_test.go
View File

@@ -6088,20 +6088,20 @@ func TestValidatePod(t *testing.T) {
},
Spec: validPodSpec(nil),
},
{ // valid opaque integer resources for init container
ObjectMeta: metav1.ObjectMeta{Name: "valid-opaque-int", Namespace: "ns"},
{ // valid extended resources for init container
ObjectMeta: metav1.ObjectMeta{Name: "valid-extended", Namespace: "ns"},
Spec: core.PodSpec{
InitContainers: []core.Container{
{
Name: "valid-opaque-int",
Name: "valid-extended",
Image: "image",
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("10"),
core.ResourceName("example.com/a"): resource.MustParse("10"),
},
Limits: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("20"),
core.ResourceName("example.com/a"): resource.MustParse("10"),
},
},
TerminationMessagePolicy: "File",
@@ -6112,21 +6112,21 @@ func TestValidatePod(t *testing.T) {
DNSPolicy: core.DNSClusterFirst,
},
},
{ // valid opaque integer resources for regular container
ObjectMeta: metav1.ObjectMeta{Name: "valid-opaque-int", Namespace: "ns"},
{ // valid extended resources for regular container
ObjectMeta: metav1.ObjectMeta{Name: "valid-extended", Namespace: "ns"},
Spec: core.PodSpec{
InitContainers: []core.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: "File"}},
Containers: []core.Container{
{
Name: "valid-opaque-int",
Name: "valid-extended",
Image: "image",
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("10"),
core.ResourceName("example.com/a"): resource.MustParse("10"),
},
Limits: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("20"),
core.ResourceName("example.com/a"): resource.MustParse("10"),
},
},
TerminationMessagePolicy: "File",
@@ -6738,8 +6738,8 @@ func TestValidatePod(t *testing.T) {
Spec: validPodSpec(nil),
},
},
"invalid opaque integer resource requirement: request must be <= limit": {
expectedError: "must be less than or equal to pod.alpha.kubernetes.io/opaque-int-resource-A",
"invalid extended resource requirement: request must be == limit": {
expectedError: "must be equal to example.com/a",
spec: core.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
Spec: core.PodSpec{
@@ -6750,10 +6750,10 @@ func TestValidatePod(t *testing.T) {
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("2"),
core.ResourceName("example.com/a"): resource.MustParse("2"),
},
Limits: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("1"),
core.ResourceName("example.com/a"): resource.MustParse("1"),
},
},
},
@@ -6763,7 +6763,7 @@ func TestValidatePod(t *testing.T) {
},
},
},
"invalid fractional opaque integer resource in container request": {
"invalid fractional extended resource in container request": {
expectedError: "must be an integer",
spec: core.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6775,7 +6775,7 @@ func TestValidatePod(t *testing.T) {
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("500m"),
core.ResourceName("example.com/a"): resource.MustParse("500m"),
},
},
},
@@ -6785,7 +6785,7 @@ func TestValidatePod(t *testing.T) {
},
},
},
"invalid fractional opaque integer resource in init container request": {
"invalid fractional extended resource in init container request": {
expectedError: "must be an integer",
spec: core.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6797,7 +6797,7 @@ func TestValidatePod(t *testing.T) {
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("500m"),
core.ResourceName("example.com/a"): resource.MustParse("500m"),
},
},
},
@@ -6808,7 +6808,7 @@ func TestValidatePod(t *testing.T) {
},
},
},
"invalid fractional opaque integer resource in container limit": {
"invalid fractional extended resource in container limit": {
expectedError: "must be an integer",
spec: core.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6820,10 +6820,10 @@ func TestValidatePod(t *testing.T) {
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("5"),
core.ResourceName("example.com/a"): resource.MustParse("5"),
},
Limits: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("2.5"),
core.ResourceName("example.com/a"): resource.MustParse("2.5"),
},
},
},
@@ -6833,7 +6833,7 @@ func TestValidatePod(t *testing.T) {
},
},
},
"invalid fractional opaque integer resource in init container limit": {
"invalid fractional extended resource in init container limit": {
expectedError: "must be an integer",
spec: core.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "123", Namespace: "ns"},
@@ -6845,10 +6845,10 @@ func TestValidatePod(t *testing.T) {
ImagePullPolicy: "IfNotPresent",
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("5"),
core.ResourceName("example.com/a"): resource.MustParse("2.5"),
},
Limits: core.ResourceList{
helper.OpaqueIntResourceName("A"): resource.MustParse("2.5"),
core.ResourceName("example.com/a"): resource.MustParse("2.5"),
},
},
},
@@ -9611,55 +9611,55 @@ func TestValidateNodeUpdate(t *testing.T) {
}, false},
{core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "valid-opaque-int-resources",
Name: "valid-extended-resources",
},
}, core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "valid-opaque-int-resources",
Name: "valid-extended-resources",
},
Status: core.NodeStatus{
Capacity: core.ResourceList{
core.ResourceName(core.ResourceCPU): resource.MustParse("10"),
core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
helper.OpaqueIntResourceName("A"): resource.MustParse("5"),
helper.OpaqueIntResourceName("B"): resource.MustParse("10"),
core.ResourceName("example.com/a"): resource.MustParse("5"),
core.ResourceName("example.com/b"): resource.MustParse("10"),
},
},
}, true},
{core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "invalid-fractional-opaque-int-capacity",
Name: "invalid-fractional-extended-capacity",
},
}, core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "invalid-fractional-opaque-int-capacity",
Name: "invalid-fractional-extended-capacity",
},
Status: core.NodeStatus{
Capacity: core.ResourceList{
core.ResourceName(core.ResourceCPU): resource.MustParse("10"),
core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
helper.OpaqueIntResourceName("A"): resource.MustParse("500m"),
core.ResourceName("example.com/a"): resource.MustParse("500m"),
},
},
}, false},
{core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "invalid-fractional-opaque-int-allocatable",
Name: "invalid-fractional-extended-allocatable",
},
}, core.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "invalid-fractional-opaque-int-allocatable",
Name: "invalid-fractional-extended-allocatable",
},
Status: core.NodeStatus{
Capacity: core.ResourceList{
core.ResourceName(core.ResourceCPU): resource.MustParse("10"),
core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
helper.OpaqueIntResourceName("A"): resource.MustParse("5"),
core.ResourceName("example.com/a"): resource.MustParse("5"),
},
Allocatable: core.ResourceList{
core.ResourceName(core.ResourceCPU): resource.MustParse("10"),
core.ResourceName(core.ResourceMemory): resource.MustParse("10G"),
helper.OpaqueIntResourceName("A"): resource.MustParse("4.5"),
core.ResourceName("example.com/a"): resource.MustParse("4.5"),
},
},
}, false},