Skip to content

K
k3s
Commit b4e7628a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #47329 from zhangxiaoyu-zidif/delete-meaningless-funcion-return

Automatic merge from submit-queue Delete unused return **What this PR does / why we need it**: We do not use the function return, it's better not to write the return. **Release note**: ```release-note NONE ```
parents 954c356d f244e3cb
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
test/e2e/scheduling/predicates.go
View file @ b4e7628a
...@@ -276,7 +276,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -276,7 +276,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to relaunch the pod, now with labels.") By("Trying to relaunch the pod, now with labels.")
labelPodName := "with-labels" labelPodName := "with-labels"
_ = createPausePod(f, pausePodConfig{ createPausePod(f, pausePodConfig{
Name: labelPodName, Name: labelPodName,
NodeSelector: map[string]string{ NodeSelector: map[string]string{
"kubernetes.io/hostname": nodeName, "kubernetes.io/hostname": nodeName,
...@@ -350,7 +350,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -350,7 +350,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to relaunch the pod, now with labels.") By("Trying to relaunch the pod, now with labels.")
labelPodName := "with-labels" labelPodName := "with-labels"
_ = createPausePod(f, pausePodConfig{ createPausePod(f, pausePodConfig{
Name: labelPodName, Name: labelPodName,
Affinity: &v1.Affinity{ Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{ NodeAffinity: &v1.NodeAffinity{
...@@ -463,7 +463,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -463,7 +463,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to launch the pod, now with podAffinity.") By("Trying to launch the pod, now with podAffinity.")
labelPodName := "with-podaffinity-" + string(uuid.NewUUID()) labelPodName := "with-podaffinity-" + string(uuid.NewUUID())
_ = createPausePod(f, pausePodConfig{ createPausePod(f, pausePodConfig{
Name: labelPodName, Name: labelPodName,
Affinity: &v1.Affinity{ Affinity: &v1.Affinity{
PodAffinity: &v1.PodAffinity{ PodAffinity: &v1.PodAffinity{
...@@ -574,7 +574,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -574,7 +574,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to launch the pod, now with multiple pod affinities with diff LabelOperators.") By("Trying to launch the pod, now with multiple pod affinities with diff LabelOperators.")
labelPodName := "with-podaffinity-" + string(uuid.NewUUID()) labelPodName := "with-podaffinity-" + string(uuid.NewUUID())
_ = createPausePod(f, pausePodConfig{ createPausePod(f, pausePodConfig{
Name: labelPodName, Name: labelPodName,
Affinity: &v1.Affinity{ Affinity: &v1.Affinity{
PodAffinity: &v1.PodAffinity{ PodAffinity: &v1.PodAffinity{
...@@ -689,7 +689,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -689,7 +689,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to relaunch the pod, now with tolerations.") By("Trying to relaunch the pod, now with tolerations.")
tolerationPodName := "with-tolerations" tolerationPodName := "with-tolerations"
_ = createPausePod(f, pausePodConfig{ createPausePod(f, pausePodConfig{
Name: tolerationPodName, Name: tolerationPodName,
Tolerations: []v1.Toleration{{Key: testTaint.Key, Value: testTaint.Value, Effect: testTaint.Effect}}, Tolerations: []v1.Toleration{{Key: testTaint.Key, Value: testTaint.Value, Effect: testTaint.Effect}},
NodeSelector: map[string]string{labelKey: labelValue}, NodeSelector: map[string]string{labelKey: labelValue},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment