github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

Scheduler: remove pkg/apis/core/field_constants.go

Browse Source
This commit is contained in:
xiaofei.sun
2021-02-24 18:06:29 +08:00
parent c78f67a005
commit fd62f32125
41 changed files with 101 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/daemon/daemon_controller_test.go
View File

@@ -737,7 +737,7 @@ func TestSimpleDaemonSetScheduleDaemonSetPodsLaunchesPods(t *testing.T) {
}
field := nodeSelector.NodeSelectorTerms[0].MatchFields[0]
if field.Key == api.ObjectNameField {
if field.Key == metav1.ObjectNameField {
if field.Operator != v1.NodeSelectorOpIn {
t.Fatalf("the operation of hostname NodeAffinity is not %v", v1.NodeSelectorOpIn)
}
@@ -2699,7 +2699,7 @@ func TestDeleteUnscheduledPodForNotExistingNode(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node-2"},
},

2
pkg/controller/daemon/util/BUILD
View File

@@ -12,7 +12,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/controller/daemon/util",
deps = [
"//pkg/api/v1/pod:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/v1/helper:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -39,7 +38,6 @@ go_test(
srcs = ["daemonset_util_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/apis/core:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

7
pkg/controller/daemon/util/daemonset_util.go
View File

@@ -25,7 +25,6 @@ import (
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
api "k8s.io/kubernetes/pkg/apis/core"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
)
@@ -151,7 +150,7 @@ func SplitByAvailablePods(minReadySeconds int32, pods []*v1.Pod) ([]*v1.Pod, []*
// Note that this function assumes that no NodeAffinity conflicts with the selected nodeName.
func ReplaceDaemonSetPodNodeNameNodeAffinity(affinity *v1.Affinity, nodename string) *v1.Affinity {
nodeSelReq := v1.NodeSelectorRequirement{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{nodename},
}
@@ -220,11 +219,11 @@ func GetTargetNodeName(pod *v1.Pod) (string, error) {
for _, term := range terms {
for _, exp := range term.MatchFields {
if exp.Key == api.ObjectNameField &&
if exp.Key == metav1.ObjectNameField &&
exp.Operator == v1.NodeSelectorOpIn {
if len(exp.Values) != 1 {
return "", fmt.Errorf("the matchFields value of '%s' is not unique for pod %s/%s",
api.ObjectNameField, pod.Namespace, pod.Name)
metav1.ObjectNameField, pod.Namespace, pod.Name)
}
return exp.Values[0], nil

27
pkg/controller/daemon/util/daemonset_util_test.go
View File

@@ -27,7 +27,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/component-base/featuregate"
featuregatetesting "k8s.io/component-base/featuregate/testing"
api "k8s.io/kubernetes/pkg/apis/core"
utilpointer "k8s.io/utils/pointer"
)
@@ -185,7 +184,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -222,7 +221,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -272,7 +271,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -291,7 +290,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1", "host_2"},
},
@@ -309,7 +308,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -330,7 +329,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -358,7 +357,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_2"},
},
@@ -376,7 +375,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -395,7 +394,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpNotIn,
Values: []string{"host_2"},
},
@@ -413,7 +412,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -453,7 +452,7 @@ func TestReplaceDaemonSetPodNodeNameNodeAffinity(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"host_1"},
},
@@ -519,7 +518,7 @@ func TestGetTargetNodeName(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node-1"},
},
@@ -547,7 +546,7 @@ func TestGetTargetNodeName(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: api.ObjectNameField,
Key: metav1.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node-1", "node-2"},
},