mirror of
https://github.com/paralus/paralus.git
synced 2026-05-21 07:43:04 +00:00
refactor: remove unused func/var/methods (#315)
Signed-off-by: Dhruv Jain <92215138+jaydee029@users.noreply.github.com>
This commit is contained in:
@@ -3,8 +3,6 @@ package apply
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/paralus/paralus/pkg/controller/client"
|
||||
@@ -13,7 +11,6 @@ import (
|
||||
clusterv2 "github.com/paralus/paralus/proto/types/controller"
|
||||
apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
|
||||
apierrs "k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
@@ -270,54 +267,6 @@ func (a *applier) pollCRDUntilEstablished(ctx context.Context, timeout time.Dura
|
||||
})
|
||||
}
|
||||
|
||||
func getGVKIfNotFound(obj runtime.Object) (schema.GroupVersionKind, error) {
|
||||
currentGVK := obj.GetObjectKind().GroupVersionKind()
|
||||
formedGVK := schema.GroupVersionKind{}
|
||||
|
||||
kind := currentGVK.Kind
|
||||
if len(kind) == 0 {
|
||||
gvks, _, err := scheme.Scheme.ObjectKinds(obj)
|
||||
if err != nil {
|
||||
return formedGVK, err
|
||||
}
|
||||
kind = gvks[0].Kind
|
||||
}
|
||||
|
||||
var listMeta metav1.Common
|
||||
objectMeta, err := meta.Accessor(obj)
|
||||
if err != nil {
|
||||
listMeta, err = meta.CommonAccessor(obj)
|
||||
if err != nil {
|
||||
return formedGVK, err
|
||||
}
|
||||
} else {
|
||||
listMeta = objectMeta
|
||||
}
|
||||
|
||||
version := currentGVK.GroupVersion().String()
|
||||
if len(version) == 0 {
|
||||
selfLink := listMeta.GetSelfLink()
|
||||
if len(selfLink) == 0 {
|
||||
return formedGVK, ErrNoSelfLink
|
||||
}
|
||||
selfLinkURL, err := url.Parse(selfLink)
|
||||
if err != nil {
|
||||
return formedGVK, err
|
||||
}
|
||||
// example paths: /<prefix>/<version>/*
|
||||
parts := strings.Split(selfLinkURL.Path, "/")
|
||||
if len(parts) < 3 {
|
||||
return formedGVK, fmt.Errorf("unexpected self link format: '%v'; got version '%v'", selfLink, version)
|
||||
}
|
||||
version = parts[2]
|
||||
}
|
||||
|
||||
formedGVK.Kind = kind
|
||||
formedGVK.Version = version
|
||||
|
||||
return formedGVK, nil
|
||||
}
|
||||
|
||||
func (a *applier) ApplyStatus(ctx context.Context, obj ctrlclient.Object, statusObj interface{}) error {
|
||||
var objectKey ctrlclient.ObjectKey
|
||||
var original ctrlclient.Object
|
||||
|
||||
@@ -10,15 +10,10 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
logf "sigs.k8s.io/controller-runtime/pkg/log"
|
||||
)
|
||||
|
||||
//var json = jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
|
||||
var (
|
||||
patchLog = logf.Log.WithName("cluster-v2-patch")
|
||||
)
|
||||
|
||||
type patch struct {
|
||||
current client.Object
|
||||
}
|
||||
|
||||
@@ -1,18 +1,12 @@
|
||||
package client
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/paralus/paralus/pkg/controller/scheme"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/config"
|
||||
)
|
||||
|
||||
var (
|
||||
defaultResyncInterval = time.Second * 30
|
||||
)
|
||||
|
||||
// New returns new kubernetes client
|
||||
func New() (client.Client, error) {
|
||||
|
||||
|
||||
@@ -165,18 +165,6 @@ func getJobState(j *batchv1.Job) (state clusterv2.StepObjectState, reason string
|
||||
return
|
||||
}
|
||||
|
||||
func getPersistentVolumeClaimState(pvc *corev1.PersistentVolumeClaim) (state clusterv2.StepObjectState, reason string) {
|
||||
if pvc.Status.Phase == corev1.ClaimBound {
|
||||
state = clusterv2.StepObjectComplete
|
||||
reason = "claim bound"
|
||||
return
|
||||
}
|
||||
|
||||
state = clusterv2.StepObjectCreated
|
||||
reason = "in progress"
|
||||
return
|
||||
}
|
||||
|
||||
// ObjectState returns the object state of runtime object
|
||||
func ObjectState(o runtime.Object) (state clusterv2.StepObjectState, reason string) {
|
||||
switch o.(type) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import (
|
||||
clusterv2 "github.com/paralus/paralus/proto/types/controller"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
apierrs "k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
@@ -23,7 +22,6 @@ import (
|
||||
|
||||
var (
|
||||
stepLog = logf.Log.WithName("cluster-v2-step")
|
||||
ma = meta.NewAccessor()
|
||||
)
|
||||
|
||||
// Handler is the interface for working with steps
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
package step
|
||||
|
||||
import (
|
||||
apierrs "k8s.io/apimachinery/pkg/api/errors"
|
||||
)
|
||||
|
||||
func isHardFailure(err error) {
|
||||
switch {
|
||||
case apierrs.IsBadRequest(err), apierrs.IsInvalid(err):
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1590,25 +1590,6 @@ func findMapInSliceBasedOnKeyValue(m []interface{}, key string, value interface{
|
||||
return nil, 0, false, nil
|
||||
}
|
||||
|
||||
// This function takes a JSON map and sorts all the lists that should be merged
|
||||
// by key. This is needed by tests because in JSON, list order is significant,
|
||||
// but in Strategic Merge Patch, merge lists do not have significant order.
|
||||
// Sorting the lists allows for order-insensitive comparison of patched maps.
|
||||
func sortMergeListsByName(mapJSON []byte, schema LookupPatchMeta) ([]byte, error) {
|
||||
var m map[string]interface{}
|
||||
err := json.Unmarshal(mapJSON, &m)
|
||||
if err != nil {
|
||||
return nil, mergepatch.ErrBadJSONDoc
|
||||
}
|
||||
|
||||
newM, err := sortMergeListsByNameMap(m, schema)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return json.Marshal(newM)
|
||||
}
|
||||
|
||||
// Function sortMergeListsByNameMap recursively sorts the merge lists by its mergeKey in a map.
|
||||
func sortMergeListsByNameMap(s map[string]interface{}, schema LookupPatchMeta) (map[string]interface{}, error) {
|
||||
newS := map[string]interface{}{}
|
||||
|
||||
Reference in New Issue
Block a user