Skip to content

Update openshift client-go and api #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jul 8, 2019
Merged

Update openshift client-go and api #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395b503
Update openshift client-go and api
jcpowermac Jul 5, 2019
3033fde
Updated client.Config() to ConfigV1()
jcpowermac Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/cvo/cvo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ type clientCVLister struct {
}

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

func (c *clientCOLister) Get(name string) (*configv1.ClusterOperator, error) {
return c.client.Config().ClusterOperators().Get(name, metav1.GetOptions{})
return c.client.ConfigV1().ClusterOperators().Get(name, metav1.GetOptions{})
}
func (c *clientCOLister) List(selector labels.Selector) (ret []*configv1.ClusterOperator, err error) {
list, err := c.client.Config().ClusterOperators().List(metav1.ListOptions{LabelSelector: selector.String()})
list, err := c.client.ConfigV1().ClusterOperators().List(metav1.ListOptions{LabelSelector: selector.String()})
if err != nil {
return nil, err
}
Expand Down
22 changes: 11 additions & 11 deletions pkg/start/start_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
t.Fatal(err)
}
defer func() {
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
t.Logf("failed to delete cluster version %s: %v", ns, err)
}
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
Expand Down Expand Up @@ -271,7 +271,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
t.Fatal(err)
}
time.Sleep(time.Second)
cv, err := client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
cv, err := client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
if err != nil {
t.Fatal(err)
}
Expand All @@ -281,7 +281,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
verifyReleasePayload(t, kc, ns, "0.0.1", payloadImage1)

t.Logf("trigger an update to a new version")
cv, err = client.Config().ClusterVersions().Patch(ns, types.MergePatchType, []byte(fmt.Sprintf(`{"spec":{"desiredUpdate":{"image":"%s"}}}`, payloadImage2)))
cv, err = client.ConfigV1().ClusterVersions().Patch(ns, types.MergePatchType, []byte(fmt.Sprintf(`{"spec":{"desiredUpdate":{"image":"%s"}}}`, payloadImage2)))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -317,7 +317,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
t.Fatal(err)
}
time.Sleep(time.Second)
cv, err = client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
cv, err = client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -354,7 +354,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
t.Fatal(err)
}
defer func() {
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
t.Logf("failed to delete cluster version %s: %v", ns, err)
}
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
Expand Down Expand Up @@ -411,7 +411,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
verifyReleasePayload(t, kc, ns, "0.0.1", payloadImage1)

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

t.Logf("switch back to 0.0.1 and verify it succeeds")
cv, err = client.Config().ClusterVersions().Patch(ns, types.MergePatchType, []byte(`{"spec":{"desiredUpdate":{"image":"", "version":"0.0.1"}}}`))
cv, err = client.ConfigV1().ClusterVersions().Patch(ns, types.MergePatchType, []byte(`{"spec":{"desiredUpdate":{"image":"", "version":"0.0.1"}}}`))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -481,7 +481,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
t.Fatal(err)
}
defer func() {
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
t.Logf("failed to delete cluster version %s: %v", ns, err)
}
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
Expand Down Expand Up @@ -604,7 +604,7 @@ func TestIntegrationCVO_cincinnatiRequest(t *testing.T) {
t.Fatal(err)
}
defer func() {
if err := client.Config().ClusterVersions().Delete(ns, nil); err != nil {
if err := client.ConfigV1().ClusterVersions().Delete(ns, nil); err != nil {
t.Logf("failed to delete cluster version %s: %v", ns, err)
}
if err := kc.Core().Namespaces().Delete(ns, nil); err != nil {
Expand Down Expand Up @@ -711,7 +711,7 @@ metadata:
func waitForUpdateAvailable(t *testing.T, client clientset.Interface, ns string, allowIncrementalFailure bool, versions ...string) (*configv1.ClusterVersion, error) {
var lastCV *configv1.ClusterVersion
return lastCV, wait.PollImmediate(200*time.Millisecond, 60*time.Second, func() (bool, error) {
cv, err := client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
cv, err := client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
if errors.IsNotFound(err) {
return false, nil
}
Expand Down Expand Up @@ -822,7 +822,7 @@ func waitForUpdateAvailable(t *testing.T, client clientset.Interface, ns string,
func waitUntilUpgradeFails(t *testing.T, client clientset.Interface, ns string, failingReason, failingMessage, progressingMessage string, versions ...string) (*configv1.ClusterVersion, error) {
var lastCV *configv1.ClusterVersion
return lastCV, wait.PollImmediate(200*time.Millisecond, 60*time.Second, func() (bool, error) {
cv, err := client.Config().ClusterVersions().Get(ns, metav1.GetOptions{})
cv, err := client.ConfigV1().ClusterVersions().Get(ns, metav1.GetOptions{})
if errors.IsNotFound(err) {
return false, nil
}
Expand Down
Loading