Skip to content

Commit 62219e1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#76978 from alejandrox1/framework-deployment-refactor
Refeactored framework deployment utils
2 parents 332d62a + 8200ae6 commit 62219e1

File tree

8 files changed

+76
-18
lines changed

8 files changed

+76
-18
lines changed

‎test/e2e/apps/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ go_library(
6161
"//staging/src/k8s.io/client-go/tools/watch:go_default_library",
6262
"//test/e2e/common:go_default_library",
6363
"//test/e2e/framework:go_default_library",
64+
"//test/e2e/framework/deployment:go_default_library",
6465
"//test/e2e/framework/job:go_default_library",
6566
"//test/e2e/framework/replicaset:go_default_library",
6667
"//test/utils:go_default_library",

‎test/e2e/apps/deployment.go‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
appsinternal "k8s.io/kubernetes/pkg/apis/apps"
4040
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
4141
"k8s.io/kubernetes/test/e2e/framework"
42+
frameworkdeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
4243
"k8s.io/kubernetes/test/e2e/framework/replicaset"
4344
testutil "k8s.io/kubernetes/test/utils"
4445
utilpointer "k8s.io/utils/pointer"
@@ -320,7 +321,7 @@ func testRecreateDeployment(f *framework.Framework) {
320321

321322
// Update deployment to delete redis pods and bring up nginx pods.
322323
framework.Logf("Triggering a new rollout for deployment %q", deploymentName)
323-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deploymentName, func(update *apps.Deployment) {
324+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deploymentName, func(update *apps.Deployment) {
324325
update.Spec.Template.Spec.Containers[0].Name = NginxImageName
325326
update.Spec.Template.Spec.Containers[0].Image = NginxImage
326327
})
@@ -462,7 +463,7 @@ func testRolloverDeployment(f *framework.Framework) {
462463
// The deployment is stuck, update it to rollover the above 2 ReplicaSets and bring up redis pods.
463464
framework.Logf("Rollover old replica sets for deployment %q with new image update", deploymentName)
464465
updatedDeploymentImageName, updatedDeploymentImage := RedisImageName, RedisImage
465-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, newDeployment.Name, func(update *apps.Deployment) {
466+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, newDeployment.Name, func(update *apps.Deployment) {
466467
update.Spec.Template.Spec.Containers[0].Name = updatedDeploymentImageName
467468
update.Spec.Template.Spec.Containers[0].Image = updatedDeploymentImage
468469
})
@@ -535,7 +536,7 @@ func testRollbackDeployment(f *framework.Framework) {
535536
updatedDeploymentImage := RedisImage
536537
updatedDeploymentImageName := RedisImageName
537538
updateAnnotation := map[string]string{"action": "update", "log": "I need to update it"}
538-
deployment, err := framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *apps.Deployment) {
539+
deployment, err := frameworkdeployment.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *apps.Deployment) {
539540
update.Spec.Template.Spec.Containers[0].Name = updatedDeploymentImageName
540541
update.Spec.Template.Spec.Containers[0].Image = updatedDeploymentImage
541542
update.Annotations = updateAnnotation
@@ -681,7 +682,7 @@ func testIterativeDeployments(f *framework.Framework) {
681682
case n < 0.2:
682683
// trigger a new deployment
683684
framework.Logf("%02d: triggering a new rollout for deployment %q", i, deployment.Name)
684-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
685+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
685686
newEnv := v1.EnvVar{Name: "A", Value: fmt.Sprintf("%d", i)}
686687
update.Spec.Template.Spec.Containers[0].Env = append(update.Spec.Template.Spec.Containers[0].Env, newEnv)
687688
randomScale(update, i)
@@ -691,7 +692,7 @@ func testIterativeDeployments(f *framework.Framework) {
691692
case n < 0.4:
692693
// rollback to the previous version
693694
framework.Logf("%02d: rolling back a rollout for deployment %q", i, deployment.Name)
694-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
695+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
695696
if update.Annotations == nil {
696697
update.Annotations = make(map[string]string)
697698
}
@@ -702,7 +703,7 @@ func testIterativeDeployments(f *framework.Framework) {
702703
case n < 0.6:
703704
// just scaling
704705
framework.Logf("%02d: scaling deployment %q", i, deployment.Name)
705-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
706+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
706707
randomScale(update, i)
707708
})
708709
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -711,14 +712,14 @@ func testIterativeDeployments(f *framework.Framework) {
711712
// toggling the deployment
712713
if deployment.Spec.Paused {
713714
framework.Logf("%02d: pausing deployment %q", i, deployment.Name)
714-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
715+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
715716
update.Spec.Paused = true
716717
randomScale(update, i)
717718
})
718719
gomega.Expect(err).NotTo(gomega.HaveOccurred())
719720
} else {
720721
framework.Logf("%02d: resuming deployment %q", i, deployment.Name)
721-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
722+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
722723
update.Spec.Paused = false
723724
randomScale(update, i)
724725
})
@@ -755,7 +756,7 @@ func testIterativeDeployments(f *framework.Framework) {
755756
deployment, err = c.AppsV1().Deployments(ns).Get(deployment.Name, metav1.GetOptions{})
756757
gomega.Expect(err).NotTo(gomega.HaveOccurred())
757758
if deployment.Spec.Paused {
758-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
759+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
759760
update.Spec.Paused = false
760761
})
761762
}
@@ -861,7 +862,7 @@ func testProportionalScalingDeployment(f *framework.Framework) {
861862
// Update the deployment with a non-existent image so that the new replica set
862863
// will be blocked to simulate a partial rollout.
863864
framework.Logf("Updating deployment %q with a non-existent image", deploymentName)
864-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *apps.Deployment) {
865+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *apps.Deployment) {
865866
update.Spec.Template.Spec.Containers[0].Image = "nginx:404"
866867
})
867868
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -921,7 +922,7 @@ func testProportionalScalingDeployment(f *framework.Framework) {
921922
// Scale the deployment to 30 replicas.
922923
newReplicas = int32(30)
923924
framework.Logf("Scaling up the deployment %q from %d to %d", deploymentName, replicas, newReplicas)
924-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
925+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *apps.Deployment) {
925926
update.Spec.Replicas = &newReplicas
926927
})
927928
gomega.Expect(err).NotTo(gomega.HaveOccurred())

‎test/e2e/framework/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ filegroup(
148148
":package-srcs",
149149
"//test/e2e/framework/auth:all-srcs",
150150
"//test/e2e/framework/config:all-srcs",
151+
"//test/e2e/framework/deployment:all-srcs",
151152
"//test/e2e/framework/ginkgowrapper:all-srcs",
152153
"//test/e2e/framework/gpu:all-srcs",
153154
"//test/e2e/framework/ingress:all-srcs",

‎test/e2e/framework/deployment/BUILD‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
load("@io_bazel_rules_go//go:def.bzl", "go_library")
4+
5+
go_library(
6+
name = "go_default_library",
7+
srcs = ["utils.go"],
8+
importpath = "k8s.io/kubernetes/test/e2e/framework/deployment",
9+
deps = [
10+
"//staging/src/k8s.io/api/apps/v1:go_default_library",
11+
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
12+
"//test/e2e/framework:go_default_library",
13+
"//test/utils:go_default_library",
14+
],
15+
)
16+
17+
filegroup(
18+
name = "package-srcs",
19+
srcs = glob(["**"]),
20+
tags = ["automanaged"],
21+
visibility = ["//visibility:private"],
22+
)
23+
24+
filegroup(
25+
name = "all-srcs",
26+
srcs = [":package-srcs"],
27+
tags = ["automanaged"],
28+
visibility = ["//visibility:public"],
29+
)

‎test/e2e/framework/deployment/utils.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
Copyright 2017 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package deployment
18+
19+
import (
20+
apps "k8s.io/api/apps/v1"
21+
clientset "k8s.io/client-go/kubernetes"
22+
"k8s.io/kubernetes/test/e2e/framework"
23+
testutils "k8s.io/kubernetes/test/utils"
24+
)
25+
26+
// UpdateDeploymentWithRetries updates the specified deployment with retries.
27+
func UpdateDeploymentWithRetries(c clientset.Interface, namespace, name string, applyUpdate testutils.UpdateDeploymentFunc) (*apps.Deployment, error) {
28+
return testutils.UpdateDeploymentWithRetries(c, namespace, name, applyUpdate, framework.Logf, framework.Poll, framework.PollShortTimeout)
29+
}

‎test/e2e/framework/deployment_util.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ import (
3636
imageutils "k8s.io/kubernetes/test/utils/image"
3737
)
3838

39-
// UpdateDeploymentWithRetries updates the specified deployment with retries.
40-
func UpdateDeploymentWithRetries(c clientset.Interface, namespace, name string, applyUpdate testutils.UpdateDeploymentFunc) (*apps.Deployment, error) {
41-
return testutils.UpdateDeploymentWithRetries(c, namespace, name, applyUpdate, Logf, Poll, PollShortTimeout)
42-
}
43-
4439
// WaitForDeploymentOldRSsNum waits for the deployment to clean up old rcs.
4540
func WaitForDeploymentOldRSsNum(c clientset.Interface, ns, deploymentName string, desiredRSNum int) error {
4641
var oldRSs []*apps.ReplicaSet

‎test/e2e/upgrades/apps/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ go_library(
2727
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
2828
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
2929
"//test/e2e/framework:go_default_library",
30+
"//test/e2e/framework/deployment:go_default_library",
3031
"//test/e2e/framework/job:go_default_library",
3132
"//test/e2e/framework/replicaset:go_default_library",
3233
"//test/e2e/upgrades:go_default_library",

‎test/e2e/upgrades/apps/deployments.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/types"
2525
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
2626
"k8s.io/kubernetes/test/e2e/framework"
27+
frameworkdeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
2728
"k8s.io/kubernetes/test/e2e/upgrades"
2829

2930
"github.com/onsi/ginkgo"
@@ -82,7 +83,7 @@ func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) {
8283

8384
// Trigger a new rollout so that we have some history.
8485
ginkgo.By(fmt.Sprintf("Triggering a new rollout for deployment %q", deploymentName))
85-
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deploymentName, func(update *apps.Deployment) {
86+
deployment, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deploymentName, func(update *apps.Deployment) {
8687
update.Spec.Template.Spec.Containers[0].Name = "updated-name"
8788
})
8889
framework.ExpectNoError(err)
@@ -158,7 +159,7 @@ func (t *DeploymentUpgradeTest) Test(f *framework.Framework, done <-chan struct{
158159

159160
// Verify the upgraded deployment is active by scaling up the deployment by 1
160161
ginkgo.By(fmt.Sprintf("Scaling up replicaset of deployment %q by 1", deploymentName))
161-
_, err = framework.UpdateDeploymentWithRetries(c, ns, deploymentName, func(deployment *apps.Deployment) {
162+
_, err = frameworkdeployment.UpdateDeploymentWithRetries(c, ns, deploymentName, func(deployment *apps.Deployment) {
162163
*deployment.Spec.Replicas = *deployment.Spec.Replicas + 1
163164
})
164165
framework.ExpectNoError(err)

0 commit comments

Comments
 (0)