Skip to content

Commit

Permalink
2 of 4 fixes for golang 1.10 (openshift#1764)
Browse files Browse the repository at this point in the history
  • Loading branch information
MHBauer authored and Jeff Peeler committed Feb 26, 2018
1 parent 656156b commit 858d467
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/apis/settings/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ type PodPresetSpec struct {
type PodPresetList struct {
metav1.TypeMeta `json:",inline"`
// +optional
metav1.ListMeta `json:"metadata, omitempty"`
metav1.ListMeta `json:"metadata,omitempty"`

Items []PodPreset `json:"items"`
}
2 changes: 1 addition & 1 deletion pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@ func newTestController(t *testing.T, config fakeosb.FakeClientConfiguration) (
// create a fake kube client
fakeKubeClient := &clientgofake.Clientset{}
// create a fake sc client
fakeCatalogClient := &fake.Clientset{&servicecatalogclientset.Clientset{}}
fakeCatalogClient := &fake.Clientset{Clientset: &servicecatalogclientset.Clientset{}}

fakeOSBClient := fakeosb.NewFakeClient(config) // error should always be nil
brokerClFunc := fakeosb.ReturnFakeClientFunc(fakeOSBClient)
Expand Down

0 comments on commit 858d467

Please sign in to comment.