Skip to content

K
k3s
Commit d37060d4 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #21061 from mqliang/deployment-e2e-IntPtr

Auto commit by PR queue bot
parents f56ed884 4f0031e2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/deployment.go
View file @ d37060d4
...@@ -27,6 +27,7 @@ import ( ...@@ -27,6 +27,7 @@ import (
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/util"
deploymentutil "k8s.io/kubernetes/pkg/util/deployment" deploymentutil "k8s.io/kubernetes/pkg/util/deployment"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
...@@ -406,8 +407,7 @@ func testDeploymentCleanUpPolicy(f *Framework) { ...@@ -406,8 +407,7 @@ func testDeploymentCleanUpPolicy(f *Framework) {
} }
rsName := "nginx-controller" rsName := "nginx-controller"
replicas := 1 replicas := 1
revisionHistoryLimit := new(int) revisionHistoryLimit := util.IntPtr(0)
*revisionHistoryLimit = 0
_, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, replicas, rsPodLabels, "nginx", "nginx")) _, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, replicas, rsPodLabels, "nginx", "nginx"))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
......
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