Skip to content

Commit 3e8705d

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20545 from mfojtik/apps-10-fix-flake
apps: fix extended flake
2 parents 2ec18a7 + 434a8e1 commit 3e8705d

23 files changed

+43
-50
lines changed

‎test/extended/builds/gitauth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var _ = g.Describe("[Feature:Builds][Slow] can use private repositories as build
8989
o.Expect(err).NotTo(o.HaveOccurred())
9090

9191
g.By("expecting the deployment of the gitserver to be in the Complete phase")
92-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), gitServerDeploymentConfigName, 1, true, oc)
92+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), gitServerDeploymentConfigName, 1, true, oc)
9393
o.Expect(err).NotTo(o.HaveOccurred())
9494

9595
sourceSecretName := secretFunc()

‎test/extended/builds/jenkins_plugin.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline plugin", func() {
190190
o.Expect(err).NotTo(o.HaveOccurred())
191191

192192
g.By("waiting for jenkins deployment")
193-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "jenkins", 1, false, oc)
193+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "jenkins", 1, false, oc)
194194
if err != nil {
195195
exutil.DumpApplicationPodLogs("jenkins", oc)
196196
}
@@ -252,9 +252,9 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline plugin", func() {
252252
// we leverage some of the openshift utilities for waiting for the deployment before we poll
253253
// jenkins for the successful job completion
254254
g.By("waiting for frontend, frontend-prod deployments as signs that the build has finished")
255-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "frontend", 1, true, oc)
255+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "frontend", 1, true, oc)
256256
o.Expect(err).NotTo(o.HaveOccurred())
257-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "frontend-prod", 1, true, oc)
257+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "frontend-prod", 1, true, oc)
258258
o.Expect(err).NotTo(o.HaveOccurred())
259259

260260
g.By("get build console logs and see if succeeded")
@@ -304,9 +304,9 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline plugin", func() {
304304
// we leverage some of the openshift utilities for waiting for the deployment before we poll
305305
// jenkins for the successful job completion
306306
g.By("waiting for frontend, frontend-prod deployments as signs that the build has finished")
307-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "frontend", 1, true, oc)
307+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "frontend", 1, true, oc)
308308
o.Expect(err).NotTo(o.HaveOccurred())
309-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "frontend-prod", 1, true, oc)
309+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "frontend-prod", 1, true, oc)
310310
o.Expect(err).NotTo(o.HaveOccurred())
311311

312312
g.By("get build console logs and see if succeeded")
@@ -372,7 +372,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline plugin", func() {
372372
// we leverage some of the openshift utilities for waiting for the deployment before we poll
373373
// jenkins for the successful job completion
374374
g.By("waiting for frontend deployments as signs that the build has finished")
375-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "frontend", 1, true, oc)
375+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "frontend", 1, true, oc)
376376
o.Expect(err).NotTo(o.HaveOccurred())
377377

378378
g.By("get build console logs and see if succeeded")

‎test/extended/builds/new_app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var _ = g.Describe("[Feature:Builds][Conformance] oc new-app", func() {
6262
o.Expect(err).NotTo(o.HaveOccurred())
6363

6464
g.By("waiting for the deployment to complete")
65-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), a58, 1, true, oc)
65+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), a58, 1, true, oc)
6666
o.Expect(err).NotTo(o.HaveOccurred())
6767
})
6868

‎test/extended/builds/pipeline.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
178178
}
179179

180180
g.By("waiting for jenkins deployment")
181-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "jenkins", 1, false, oc)
181+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "jenkins", 1, false, oc)
182182
if err != nil {
183183
exutil.DumpApplicationPodLogs("jenkins", oc)
184184
}

‎test/extended/cluster/cm.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ var _ = g.Describe("[Feature:Performance][Serial][Slow] Mirror cluster", func()
8181
e2e.Logf("Listing objects in namespace %v", ns.Name)
8282

8383
// Check for DeploymentConfigs
84-
dcs, err := oc.AdminAppsClient().Apps().DeploymentConfigs(ns.Name).List(metav1.ListOptions{})
84+
dcs, err := oc.AdminAppsClient().AppsV1().DeploymentConfigs(ns.Name).List(metav1.ListOptions{})
8585
if err != nil {
8686
e2e.Failf("Error listing DeploymentConfigs: %v\n", err)
8787
}
8888

8989
for _, dc := range dcs.Items {
90-
dc, err := oc.AdminAppsClient().Apps().DeploymentConfigs(ns.Name).Get(dc.Name, metav1.GetOptions{})
90+
dc, err := oc.AdminAppsClient().AppsV1().DeploymentConfigs(ns.Name).Get(dc.Name, metav1.GetOptions{})
9191
if err != nil {
9292
e2e.Failf("Error DC not found: %v\n", err)
9393
}

‎test/extended/deployments/deployments.go

+11-18
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
215215
o.Expect(err).NotTo(o.HaveOccurred())
216216

217217
g.By(fmt.Sprintf("by checking that the second deployment exists"))
218-
// TODO when #11016 gets fixed this can be reverted to 30seconds
219-
err = wait.PollImmediate(500*time.Millisecond, 5*time.Minute, func() (bool, error) {
218+
err = wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) {
220219
_, rcs, _, err := deploymentInfo(oc, dcName)
221220
if err != nil {
222221
return false, nil
@@ -292,7 +291,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
292291
o.Expect(is.Status.Tags["direct"].Items).NotTo(o.BeEmpty())
293292
o.Expect(is.Status.Tags["pullthrough"].Items).NotTo(o.BeEmpty())
294293

295-
dc, err = oc.AppsClient().Apps().DeploymentConfigs(oc.Namespace()).Get(name, metav1.GetOptions{})
294+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Get(name, metav1.GetOptions{})
296295
o.Expect(err).NotTo(o.HaveOccurred())
297296
o.Expect(dc.Spec.Triggers).To(o.HaveLen(3))
298297

@@ -350,7 +349,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
350349
})
351350

352351
g.By("verifying the scale is updated on the deployment config")
353-
config, err := oc.AppsClient().Apps().DeploymentConfigs(oc.Namespace()).Get("deployment-test", metav1.GetOptions{})
352+
config, err := oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Get("deployment-test", metav1.GetOptions{})
354353
o.Expect(err).NotTo(o.HaveOccurred())
355354
o.Expect(config.Spec.Replicas).Should(o.BeEquivalentTo(1))
356355
o.Expect(config.Spec.Test).Should(o.BeTrue())
@@ -403,11 +402,11 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
403402
o.Expect(err).NotTo(o.HaveOccurred())
404403

405404
expectLatestVersion := func(version int) {
406-
dc, err := oc.AppsClient().Apps().DeploymentConfigs(oc.Namespace()).Get(dcName, metav1.GetOptions{})
405+
dc, err := oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Get(dcName, metav1.GetOptions{})
407406
o.Expect(err).NotTo(o.HaveOccurred())
408407
latestVersion := dc.Status.LatestVersion
409408
err = wait.PollImmediate(500*time.Millisecond, 10*time.Second, func() (bool, error) {
410-
dc, err = oc.AppsClient().Apps().DeploymentConfigs(oc.Namespace()).Get(dcName, metav1.GetOptions{})
409+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Get(dcName, metav1.GetOptions{})
411410
o.Expect(err).NotTo(o.HaveOccurred())
412411
latestVersion = dc.Status.LatestVersion
413412
return latestVersion == int64(version), nil
@@ -783,15 +782,12 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
783782
o.Expect(fmt.Errorf("expected no deployment, found %#v", rcs[0])).NotTo(o.HaveOccurred())
784783
}
785784

786-
_, err = updateConfigWithRetries(oc.AppsClient().Apps(), oc.Namespace(), dcName, func(dc *appsv1.DeploymentConfig) {
787-
// TODO: oc rollout pause should patch instead of making a full update
788-
dc.Spec.Paused = false
789-
})
785+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Patch(dcName, types.StrategicMergePatchType, []byte(`{"spec": {"paused": false}}`))
790786
o.Expect(err).NotTo(o.HaveOccurred())
791787
o.Expect(waitForLatestCondition(oc, dcName, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())
792788

793789
g.By("making sure it updates observedGeneration after being paused")
794-
dc, err = oc.AppsClient().Apps().DeploymentConfigs(oc.Namespace()).Patch(dcName, types.StrategicMergePatchType, []byte(`{"spec": {"paused": true}}`))
790+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Patch(dcName, types.StrategicMergePatchType, []byte(`{"spec": {"paused": true}}`))
795791
o.Expect(err).NotTo(o.HaveOccurred())
796792

797793
_, err = waitForDCModification(oc, dc.Namespace, dcName, deploymentChangeTimeout,
@@ -1015,9 +1011,6 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
10151011
o.Expect(err).NotTo(o.HaveOccurred())
10161012

10171013
o.Expect(dc.Spec.Triggers).To(o.BeNil())
1018-
// FIXME: remove when tests are migrated to the new client
1019-
// (the old one incorrectly translates nil into an empty array)
1020-
dc.Spec.Triggers = append(dc.Spec.Triggers, appsv1.DeploymentTriggerPolicy{Type: appsv1.DeploymentTriggerOnConfigChange})
10211014
// This is the last place we can safely say that the time was taken before replicas became ready
10221015
startTime := time.Now()
10231016
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(namespace).Create(dc)
@@ -1206,7 +1199,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
12061199
})
12071200

12081201
g.By("deleting owned RCs when deleted", func() {
1209-
err = oc.AppsClient().Apps().DeploymentConfigs(namespace).Delete(dcName, &metav1.DeleteOptions{})
1202+
err = oc.AppsClient().AppsV1().DeploymentConfigs(namespace).Delete(dcName, &metav1.DeleteOptions{})
12101203
o.Expect(err).NotTo(o.HaveOccurred())
12111204

12121205
err = wait.PollImmediate(200*time.Millisecond, 5*time.Minute, func() (bool, error) {
@@ -1286,7 +1279,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
12861279

12871280
g.By("redeploying immediately by config change")
12881281
o.Expect(dc.Spec.Template.Annotations["foo"]).NotTo(o.Equal("bar"))
1289-
dc, err = oc.AppsClient().Apps().DeploymentConfigs(dc.Namespace).Patch(dc.Name, types.StrategicMergePatchType,
1282+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(dc.Namespace).Patch(dc.Name, types.StrategicMergePatchType,
12901283
[]byte(`{"spec":{"template":{"metadata":{"annotations":{"foo": "bar"}}}}}`))
12911284
o.Expect(err).NotTo(o.HaveOccurred())
12921285
dc, err = waitForDCModification(oc, namespace, dcName, deploymentRunTimeout,
@@ -1386,7 +1379,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
13861379
dc.Spec.Replicas = 1
13871380
// Make sure the deployer pod doesn't immediately
13881381
dc.Spec.MinReadySeconds = 3
1389-
dc, err = oc.AppsClient().Apps().DeploymentConfigs(namespace).Create(dc)
1382+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(namespace).Create(dc)
13901383
o.Expect(err).NotTo(o.HaveOccurred())
13911384

13921385
g.By("waiting for RC to be created")
@@ -1431,7 +1424,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
14311424

14321425
g.By("redeploying immediately by config change")
14331426
o.Expect(dc.Spec.Template.Annotations["foo"]).NotTo(o.Equal("bar"))
1434-
dc, err = oc.AppsClient().Apps().DeploymentConfigs(dc.Namespace).Patch(dc.Name, types.StrategicMergePatchType,
1427+
dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(dc.Namespace).Patch(dc.Name, types.StrategicMergePatchType,
14351428
[]byte(`{"spec":{"template":{"metadata":{"annotations":{"foo": "bar"}}}}}`))
14361429
o.Expect(err).NotTo(o.HaveOccurred())
14371430
dc, err = waitForDCModification(oc, namespace, dcName, deploymentRunTimeout,

‎test/extended/image_ecosystem/mariadb_ephemeral.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var _ = g.Describe("[image_ecosystem][mariadb][Slow] openshift mariadb image", f
4747

4848
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
4949
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
50-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "mariadb", 1, true, oc)
50+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "mariadb", 1, true, oc)
5151
o.Expect(err).NotTo(o.HaveOccurred())
5252

5353
g.By("expecting the mariadb service get endpoints")

‎test/extended/image_ecosystem/mongodb_ephemeral.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var _ = g.Describe("[image_ecosystem][mongodb] openshift mongodb image", func()
4141
o.Expect(oc.Run("new-app").Args("-f", templatePath).Execute()).Should(o.Succeed())
4242

4343
g.By("waiting for the deployment to complete")
44-
err := exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "mongodb", 1, true, oc)
44+
err := exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "mongodb", 1, true, oc)
4545
o.Expect(err).ShouldNot(o.HaveOccurred())
4646

4747
g.By("expecting the mongodb pod is running")

‎test/extended/image_ecosystem/mysql_ephemeral.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var _ = g.Describe("[image_ecosystem][mysql][Slow] openshift mysql image", func(
4545

4646
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
4747
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
48-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "mysql", 1, true, oc)
48+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "mysql", 1, true, oc)
4949
o.Expect(err).NotTo(o.HaveOccurred())
5050

5151
g.By("expecting the mysql service get endpoints")

‎test/extended/image_ecosystem/mysql_replica.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func replicationTestFactory(oc *exutil.CLI, tc testCase, cleanup func()) func()
8888
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
8989
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
9090
g.By("waiting for the deployment to complete")
91-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), helperName, 1, true, oc)
91+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), helperName, 1, true, oc)
9292
o.Expect(err).NotTo(o.HaveOccurred())
9393

9494
g.By("waiting for an endpoint")

‎test/extended/image_ecosystem/postgresql_replica.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func PostgreSQLReplicationTestFactory(oc *exutil.CLI, image string, cleanup func
138138

139139
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
140140
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
141-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), postgreSQLHelperName, 1, true, oc)
141+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), postgreSQLHelperName, 1, true, oc)
142142
o.Expect(err).NotTo(o.HaveOccurred())
143143

144144
err = e2e.WaitForEndpoint(oc.KubeFramework().ClientSet, oc.Namespace(), postgreSQLHelperName)

‎test/extended/image_ecosystem/s2i_perl.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var _ = g.Describe("[image_ecosystem][perl][Slow] hot deploy for openshift perl
6868
}
6969
o.Expect(err).NotTo(o.HaveOccurred())
7070

71-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 1, true, oc)
71+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), dcName, 1, true, oc)
7272
o.Expect(err).NotTo(o.HaveOccurred())
7373

7474
g.By("waiting for endpoint")
@@ -95,7 +95,7 @@ var _ = g.Describe("[image_ecosystem][perl][Slow] hot deploy for openshift perl
9595
g.By("turning on hot-deploy")
9696
err = oc.Run("set", "env").Args("dc", dcName, "PERL_APACHE2_RELOAD=true").Execute()
9797
o.Expect(err).NotTo(o.HaveOccurred())
98-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 2, true, oc)
98+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), dcName, 2, true, oc)
9999
o.Expect(err).NotTo(o.HaveOccurred())
100100

101101
g.By("waiting for a new endpoint")

‎test/extended/image_ecosystem/s2i_php.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var _ = g.Describe("[image_ecosystem][php][Slow] hot deploy for openshift php im
5959
}
6060
o.Expect(err).NotTo(o.HaveOccurred())
6161

62-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), "cakephp-mysql-example", 1, true, oc)
62+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "cakephp-mysql-example", 1, true, oc)
6363
o.Expect(err).NotTo(o.HaveOccurred())
6464

6565
g.By("waiting for endpoint")

‎test/extended/image_ecosystem/s2i_python.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var _ = g.Describe("[image_ecosystem][python][Slow] hot deploy for openshift pyt
7070
}
7171
o.Expect(err).NotTo(o.HaveOccurred())
7272

73-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 1, true, oc)
73+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), dcName, 1, true, oc)
7474
o.Expect(err).NotTo(o.HaveOccurred())
7575

7676
g.By("waiting for endpoint")
@@ -107,7 +107,7 @@ var _ = g.Describe("[image_ecosystem][python][Slow] hot deploy for openshift pyt
107107
g.By("turning on hot-deploy")
108108
err = oc.Run("set", "env").Args("dc", dcName, "APP_CONFIG=conf/reload.py").Execute()
109109
o.Expect(err).NotTo(o.HaveOccurred())
110-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 2, true, oc)
110+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), dcName, 2, true, oc)
111111
o.Expect(err).NotTo(o.HaveOccurred())
112112

113113
g.By("waiting for a new endpoint")

‎test/extended/image_ecosystem/s2i_ruby.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var _ = g.Describe("[image_ecosystem][ruby][Slow] hot deploy for openshift ruby
6363
}
6464
o.Expect(err).NotTo(o.HaveOccurred())
6565

66-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 1, true, oc)
66+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), dcName, 1, true, oc)
6767
o.Expect(err).NotTo(o.HaveOccurred())
6868

6969
g.By("waiting for endpoint")
@@ -98,7 +98,7 @@ var _ = g.Describe("[image_ecosystem][ruby][Slow] hot deploy for openshift ruby
9898
g.By("turning on hot-deploy")
9999
err = oc.Run("set", "env").Args("dc", dcName, "RAILS_ENV=development").Execute()
100100
o.Expect(err).NotTo(o.HaveOccurred())
101-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), dcName, 2, true, oc)
101+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), dcName, 2, true, oc)
102102
o.Expect(err).NotTo(o.HaveOccurred())
103103

104104
g.By("waiting for a new endpoint")

‎test/extended/image_ecosystem/sample_repos.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ func NewSampleRepoTest(c sampleRepoConfig) func() {
7878
o.Expect(err).NotTo(o.HaveOccurred())
7979

8080
g.By("expecting the app deployment to be complete")
81-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), c.deploymentConfigName, 1, true, oc)
81+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), c.deploymentConfigName, 1, true, oc)
8282
o.Expect(err).NotTo(o.HaveOccurred())
8383

8484
if len(c.dbDeploymentConfigName) > 0 {
8585
g.By("expecting the db deployment to be complete")
86-
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().Apps(), oc.Namespace(), c.dbDeploymentConfigName, 1, true, oc)
86+
err = exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), c.dbDeploymentConfigName, 1, true, oc)
8787
o.Expect(err).NotTo(o.HaveOccurred())
8888

8989
g.By("expecting the db service is available")

0 commit comments

Comments
 (0)