From 130ed5c88771fa6553f4cd909492c5274b2884fd Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Thu, 14 Nov 2024 09:36:42 +0800 Subject: [PATCH] chore: update vendor longhorn/longhorn-9752 Signed-off-by: Chin-Ya Huang --- go.mod | 2 ++ go.sum | 4 ++-- .../go-common-libs/kubernetes/deployment.go | 21 +++++++++++++++++++ .../go-common-libs/kubernetes/kubernetes.go | 8 +++++++ vendor/modules.txt | 3 ++- 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a458ddd6..45069071 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.23 toolchain go1.23.3 +replace github.com/longhorn/go-common-libs => github.com/c3y1huang/go-common-libs v0.0.0-20241128010144-73029657a93b + require ( github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 github.com/longhorn/longhorn-manager v1.7.2 diff --git a/go.sum b/go.sum index e43e4ff6..78629903 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/c3y1huang/go-common-libs v0.0.0-20241128010144-73029657a93b h1:gVMVqgh4pLuBSg97OH08XVh4xzL/qXFmKWPceMEMnoU= +github.com/c3y1huang/go-common-libs v0.0.0-20241128010144-73029657a93b/go.mod h1:gSa+qB058kcNlCaOOwIFPHb3tvqMTmKcxtL7HPTS4o4= github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g= github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= @@ -102,8 +104,6 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= -github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 h1:6RHxLM2DLwr7FrDn6yyryEXwa7yN01fcZfIyllxmBss= -github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626/go.mod h1:gSa+qB058kcNlCaOOwIFPHb3tvqMTmKcxtL7HPTS4o4= github.com/longhorn/longhorn-manager v1.7.2 h1:hf0phTtk8Odq+zoVYO5JuHbKJOi4nK+iugUJ1FQw56M= github.com/longhorn/longhorn-manager v1.7.2/go.mod h1:QvOuwQP3TqICQHyJcPynjtAhF3TMCFeygVIpf9q7/cI= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/vendor/github.com/longhorn/go-common-libs/kubernetes/deployment.go b/vendor/github.com/longhorn/go-common-libs/kubernetes/deployment.go index d879832b..263e6b45 100644 --- a/vendor/github.com/longhorn/go-common-libs/kubernetes/deployment.go +++ b/vendor/github.com/longhorn/go-common-libs/kubernetes/deployment.go @@ -7,6 +7,7 @@ import ( appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" kubeclient "k8s.io/client-go/kubernetes" ) @@ -21,3 +22,23 @@ func GetDeployment(kubeClient kubeclient.Interface, namespace, name string) (*ap return kubeClient.AppsV1().Deployments(namespace).Get(context.Background(), name, metav1.GetOptions{}) } + +func ListDeployments(kubeClient kubeclient.Interface, namespace string, labelSelectors map[string]string) (*appsv1.DeploymentList, error) { + log := logrus.WithFields(logrus.Fields{ + "kind": "Deployment", + "namespace": namespace, + "labelSelectors": labelSelectors, + }) + log.Trace("Listing resources") + + var err error + selector := labels.Everything() + if len(labelSelectors) != 0 { + selector, err = NewLabelSelectorFromMap(labelSelectors) + if err != nil { + return nil, err + } + } + + return kubeClient.AppsV1().Deployments(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: selector.String()}) +} diff --git a/vendor/github.com/longhorn/go-common-libs/kubernetes/kubernetes.go b/vendor/github.com/longhorn/go-common-libs/kubernetes/kubernetes.go index 3f6b4f2f..4b62d5e1 100644 --- a/vendor/github.com/longhorn/go-common-libs/kubernetes/kubernetes.go +++ b/vendor/github.com/longhorn/go-common-libs/kubernetes/kubernetes.go @@ -3,6 +3,8 @@ package kubernetes import ( "github.com/pkg/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" @@ -23,3 +25,9 @@ func GetInClusterConfig() (*rest.Config, error) { return config, nil } + +func NewLabelSelectorFromMap(labels map[string]string) (labels.Selector, error) { + return metav1.LabelSelectorAsSelector(&metav1.LabelSelector{ + MatchLabels: labels, + }) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 6dc45354..7d805c0c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -133,7 +133,7 @@ github.com/json-iterator/go # github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de ## explicit github.com/liggitt/tabwriter -# github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 +# github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 => github.com/c3y1huang/go-common-libs v0.0.0-20241128010144-73029657a93b ## explicit; go 1.22.7 github.com/longhorn/go-common-libs/exec github.com/longhorn/go-common-libs/io @@ -928,3 +928,4 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 +# github.com/longhorn/go-common-libs => github.com/c3y1huang/go-common-libs v0.0.0-20241128010144-73029657a93b