K8s: Rename origin.key to origin.hash (#89337)
This commit is contained in:
@@ -4,16 +4,15 @@ import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/grafana/grafana/pkg/apimachinery/utils"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/selection"
|
||||
"k8s.io/apiserver/pkg/registry/rest"
|
||||
"k8s.io/klog/v2"
|
||||
|
||||
"github.com/grafana/grafana/pkg/apimachinery/utils"
|
||||
)
|
||||
|
||||
type DualWriterMode2 struct {
|
||||
@@ -317,29 +316,15 @@ func parseList(legacyList []runtime.Object) (metainternalversion.ListOptions, ma
|
||||
indexMap := map[string]int{}
|
||||
|
||||
for i, obj := range legacyList {
|
||||
metaAccessor, err := utils.MetaAccessor(obj)
|
||||
if err != nil {
|
||||
return options, nil, err
|
||||
}
|
||||
originKeys = append(originKeys, metaAccessor.GetOriginKey())
|
||||
|
||||
accessor, err := meta.Accessor(obj)
|
||||
accessor, err := utils.MetaAccessor(obj)
|
||||
if err != nil {
|
||||
return options, nil, err
|
||||
}
|
||||
indexMap[accessor.GetName()] = i
|
||||
}
|
||||
|
||||
if len(originKeys) == 0 {
|
||||
return options, nil, nil
|
||||
}
|
||||
|
||||
r, err := labels.NewRequirement(utils.AnnoKeyOriginKey, selection.In, originKeys)
|
||||
if err != nil {
|
||||
return options, nil, err
|
||||
}
|
||||
options.LabelSelector = labels.NewSelector().Add(*r)
|
||||
|
||||
return options, indexMap, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user