Skip to content

Commit 3033fde

Browse files
jcpowermacjcpowermac
committed
Updated client.Config() to ConfigV1()
1 parent 395b503 commit 3033fde

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎pkg/cvo/cvo_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ type clientCVLister struct {
4747
}
4848

4949
func (c *clientCVLister) Get(name string) (*configv1.ClusterVersion, error) {
50-
return c.client.Config().ClusterVersions().Get(name, metav1.GetOptions{})
50+
return c.client.ConfigV1().ClusterVersions().Get(name, metav1.GetOptions{})
5151
}
5252
func (c *clientCVLister) List(selector labels.Selector) (ret []*configv1.ClusterVersion, err error) {
53-
list, err := c.client.Config().ClusterVersions().List(metav1.ListOptions{LabelSelector: selector.String()})
53+
list, err := c.client.ConfigV1().ClusterVersions().List(metav1.ListOptions{LabelSelector: selector.String()})
5454
if err != nil {
5555
return nil, err
5656
}
@@ -66,10 +66,10 @@ type clientCOLister struct {
6666
}
6767

6868
func (c *clientCOLister) Get(name string) (*configv1.ClusterOperator, error) {
69-
return c.client.Config().ClusterOperators().Get(name, metav1.GetOptions{})
69+
return c.client.ConfigV1().ClusterOperators().Get(name, metav1.GetOptions{})
7070
}
7171
func (c *clientCOLister) List(selector labels.Selector) (ret []*configv1.ClusterOperator, err error) {
72-
list, err := c.client.Config().ClusterOperators().List(metav1.ListOptions{LabelSelector: selector.String()})
72+
list, err := c.client.ConfigV1().ClusterOperators().List(metav1.ListOptions{LabelSelector: selector.String()})
7373
if err != nil {
7474
return nil, err
7575
}

‎pkg/start/start_integration_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
203203
t.Fatal(err)
204204
}
205205
defer func() {
206-
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
206+
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
207207
t.Logf("failed to delete cluster version %s: %v", ns, err)
208208
}
209209
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
@@ -271,7 +271,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
271271
t.Fatal(err)
272272
}
273273
time.Sleep(time.Second)
274-
cv, err := client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
274+
cv, err := client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
275275
if err != nil {
276276
t.Fatal(err)
277277
}
@@ -281,7 +281,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
281281
verifyReleasePayload(t, kc, ns, "0.0.1", payloadImage1)
282282

283283
t.Logf("trigger an update to a new version")
284-
cv, err = client.Config().ClusterVersions().Patch(ns, types.MergePatchType, []byte(fmt.Sprintf(`{"spec":{"desiredUpdate":{"image":"%s"}}}`, payloadImage2)))
284+
cv, err = client.ConfigV1().ClusterVersions().Patch(ns, types.MergePatchType, []byte(fmt.Sprintf(`{"spec":{"desiredUpdate":{"image":"%s"}}}`, payloadImage2)))
285285
if err != nil {
286286
t.Fatal(err)
287287
}
@@ -317,7 +317,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
317317
t.Fatal(err)
318318
}
319319
time.Sleep(time.Second)
320-
cv, err = client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
320+
cv, err = client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
321321
if err != nil {
322322
t.Fatal(err)
323323
}
@@ -354,7 +354,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
354354
t.Fatal(err)
355355
}
356356
defer func() {
357-
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
357+
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
358358
t.Logf("failed to delete cluster version %s: %v", ns, err)
359359
}
360360
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
@@ -411,7 +411,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
411411
verifyReleasePayload(t, kc, ns, "0.0.1", payloadImage1)
412412

413413
t.Logf("trigger an update to a new version that should fail")
414-
cv, err := client.Config().ClusterVersions().Patch(ns, types.MergePatchType, []byte(fmt.Sprintf(`{"spec":{"desiredUpdate":{"image":"%s"}}}`, payloadImage2)))
414+
cv, err := client.ConfigV1().ClusterVersions().Patch(ns, types.MergePatchType, []byte(fmt.Sprintf(`{"spec":{"desiredUpdate":{"image":"%s"}}}`, payloadImage2)))
415415
if err != nil {
416416
t.Fatal(err)
417417
}
@@ -440,7 +440,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
440440
verifyReleasePayloadConfigMap2(t, kc, ns, "0.0.1", payloadImage1)
441441

442442
t.Logf("switch back to 0.0.1 and verify it succeeds")
443-
cv, err = client.Config().ClusterVersions().Patch(ns, types.MergePatchType, []byte(`{"spec":{"desiredUpdate":{"image":"", "version":"0.0.1"}}}`))
443+
cv, err = client.ConfigV1().ClusterVersions().Patch(ns, types.MergePatchType, []byte(`{"spec":{"desiredUpdate":{"image":"", "version":"0.0.1"}}}`))
444444
if err != nil {
445445
t.Fatal(err)
446446
}
@@ -481,7 +481,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
481481
t.Fatal(err)
482482
}
483483
defer func() {
484-
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
484+
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
485485
t.Logf("failed to delete cluster version %s: %v", ns, err)
486486
}
487487
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
@@ -604,7 +604,7 @@ func TestIntegrationCVO_cincinnatiRequest(t *testing.T) {
604604
t.Fatal(err)
605605
}
606606
defer func() {
607-
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
607+
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
608608
t.Logf("failed to delete cluster version %s: %v", ns, err)
609609
}
610610
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
@@ -711,7 +711,7 @@ metadata:
711711
func waitForUpdateAvailable(t *testing.T, client clientset.Interface, ns string, allowIncrementalFailure bool, versions ...string) (*configv1.ClusterVersion, error) {
712712
var lastCV *configv1.ClusterVersion
713713
return lastCV, wait.PollImmediate(200*time.Millisecond, 60*time.Second, func() (bool, error) {
714-
cv, err := client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
714+
cv, err := client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
715715
if errors.IsNotFound(err) {
716716
return false, nil
717717
}
@@ -822,7 +822,7 @@ func waitForUpdateAvailable(t *testing.T, client clientset.Interface, ns string,
822822
func waitUntilUpgradeFails(t *testing.T, client clientset.Interface, ns string, failingReason, failingMessage, progressingMessage string, versions ...string) (*configv1.ClusterVersion, error) {
823823
var lastCV *configv1.ClusterVersion
824824
return lastCV, wait.PollImmediate(200*time.Millisecond, 60*time.Second, func() (bool, error) {
825-
cv, err := client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
825+
cv, err := client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
826826
if errors.IsNotFound(err) {
827827
return false, nil
828828
}

0 commit comments

Comments
 (0)