From 463feb8a618efd6da636fb8bafca31f14f1b4361 Mon Sep 17 00:00:00 2001 From: f10atin9 Date: Mon, 6 Sep 2021 10:44:46 +0800 Subject: [PATCH] update return and apiserver Signed-off-by: f10atin9 --- .../resources/v1alpha3/persistentvolume/persistentvolume.go | 5 +---- pkg/models/resources/v1alpha3/resource/resource.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/models/resources/v1alpha3/persistentvolume/persistentvolume.go b/pkg/models/resources/v1alpha3/persistentvolume/persistentvolume.go index 8dad9a4fd..32646e268 100644 --- a/pkg/models/resources/v1alpha3/persistentvolume/persistentvolume.go +++ b/pkg/models/resources/v1alpha3/persistentvolume/persistentvolume.go @@ -42,10 +42,7 @@ func New(informer informers.SharedInformerFactory) v1alpha3.Interface { func (p *persistentVolumeGetter) Get(namespace, name string) (runtime.Object, error) { pv, err := p.informers.Core().V1().PersistentVolumes().Lister().Get(name) - if err != nil { - return pv, err - } - return pv, nil + return pv, err } func (p *persistentVolumeGetter) List(namespace string, query *query.Query) (*api.ListResult, error) { diff --git a/pkg/models/resources/v1alpha3/resource/resource.go b/pkg/models/resources/v1alpha3/resource/resource.go index 0cb811515..51e559d51 100644 --- a/pkg/models/resources/v1alpha3/resource/resource.go +++ b/pkg/models/resources/v1alpha3/resource/resource.go @@ -114,8 +114,8 @@ func NewResourceGetter(factory informers.InformerFactory, cache cache.Cache) *Re namespacedResourceGetters[schema.GroupVersionResource{Group: "networking.k8s.io", Version: "v1", Resource: "networkpolicies"}] = networkpolicy.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[schema.GroupVersionResource{Group: "batch", Version: "v1", Resource: "jobs"}] = job.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[schema.GroupVersionResource{Group: "app.k8s.io", Version: "v1beta1", Resource: "applications"}] = application.New(cache) + clusterResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"}] = persistentvolume.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumeclaims"}] = persistentvolumeclaim.New(factory.KubernetesSharedInformerFactory(), factory.SnapshotSharedInformerFactory()) - namespacedResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"}] = persistentvolume.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[snapshotv1beta1.SchemeGroupVersion.WithResource("volumesnapshots")] = volumesnapshot.New(factory.SnapshotSharedInformerFactory()) namespacedResourceGetters[rbacv1.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralRoleBinding)] = rolebinding.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[rbacv1.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralRole)] = role.New(factory.KubernetesSharedInformerFactory())