diff options
| author |   Eric Multanen <eric.w.multanen@intel.com> | 2020-07-15 18:43:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-15 18:43:10 +0000 |
| commit | ad17b4360890fc2915795515ac265fc66720f4ad (patch) | |
| tree | bf5c2f68b3b43178f661f7c890e9f02a496e9b56 /src/monitor/pkg | |
| parent | 8223d0671617ee6dcc68307aefd3634e1bb0ac8d (diff) | |
| parent | b986e8938aaa26945dc7dcdcb990ec8aa53afff0 (diff) | |
Merge "Update Rsync"
Diffstat (limited to 'src/monitor/pkg')
| -rw-r--r-- | src/monitor/pkg/controller/resourcebundlestate/helpers.go | 2 | ||||
| -rw-r--r-- | src/monitor/pkg/generated/clientset/versioned/typed/k8splugin/v1alpha1/k8splugin_client.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/monitor/pkg/controller/resourcebundlestate/helpers.go b/src/monitor/pkg/controller/resourcebundlestate/helpers.go index 5a5676f8..9a6538b4 100644 --- a/src/monitor/pkg/controller/resourcebundlestate/helpers.go +++ b/src/monitor/pkg/controller/resourcebundlestate/helpers.go @@ -44,7 +44,7 @@ func listResources(cli client.Client, namespace string, LabelSelector: labels.SelectorFromSet(labelSelector), } - err := cli.List(context.TODO(), listOptions, returnData) + err := cli.List(context.TODO(), returnData, listOptions) if err != nil { log.Printf("Failed to list CRs: %v", err) return err diff --git a/src/monitor/pkg/generated/clientset/versioned/typed/k8splugin/v1alpha1/k8splugin_client.go b/src/monitor/pkg/generated/clientset/versioned/typed/k8splugin/v1alpha1/k8splugin_client.go index bb4cd4d3..d63d55ba 100644 --- a/src/monitor/pkg/generated/clientset/versioned/typed/k8splugin/v1alpha1/k8splugin_client.go +++ b/src/monitor/pkg/generated/clientset/versioned/typed/k8splugin/v1alpha1/k8splugin_client.go @@ -21,7 +21,7 @@ import ( v1alpha1 "github.com/onap/multicloud-k8s/src/monitor/pkg/apis/k8splugin/v1alpha1" "github.com/onap/multicloud-k8s/src/monitor/pkg/generated/clientset/versioned/scheme" - "k8s.io/apimachinery/pkg/runtime/serializer" + //"k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) @@ -71,7 +71,8 @@ func setConfigDefaults(config *rest.Config) error { gv := v1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + //config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() |