Skip to content

Commit 7be19c0

Browse files
author
Zou Nengren
authored
Use k8s labels package (#1083)
1 parent 7794437 commit 7be19c0

File tree

11 files changed

+24
-27
lines changed

11 files changed

+24
-27
lines changed

‎pkg/lib/k8s/configmap.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
kcore "k8s.io/api/core/v1"
2222
kerrors "k8s.io/apimachinery/pkg/api/errors"
2323
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
klabels "k8s.io/apimachinery/pkg/labels"
2425
)
2526

2627
var _configMapTypeMeta = kmeta.TypeMeta{
@@ -127,7 +128,7 @@ func (c *Client) ListConfigMaps(opts *kmeta.ListOptions) ([]kcore.ConfigMap, err
127128

128129
func (c *Client) ListConfigMapsByLabels(labels map[string]string) ([]kcore.ConfigMap, error) {
129130
opts := &kmeta.ListOptions{
130-
LabelSelector: LabelSelector(labels),
131+
LabelSelector: klabels.SelectorFromSet(labels).String(),
131132
}
132133
return c.ListConfigMaps(opts)
133134
}

‎pkg/lib/k8s/deployment.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424
kcore "k8s.io/api/core/v1"
2525
kerrors "k8s.io/apimachinery/pkg/api/errors"
2626
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
intstr "k8s.io/apimachinery/pkg/util/intstr"
27+
klabels "k8s.io/apimachinery/pkg/labels"
28+
"k8s.io/apimachinery/pkg/util/intstr"
2829
)
2930

3031
var _deploymentTypeMeta = kmeta.TypeMeta{
@@ -163,7 +164,7 @@ func (c *Client) ListDeployments(opts *kmeta.ListOptions) ([]kapps.Deployment, e
163164

164165
func (c *Client) ListDeploymentsByLabels(labels map[string]string) ([]kapps.Deployment, error) {
165166
opts := &kmeta.ListOptions{
166-
LabelSelector: LabelSelector(labels),
167+
LabelSelector: klabels.SelectorFromSet(labels).String(),
167168
}
168169
return c.ListDeployments(opts)
169170
}

‎pkg/lib/k8s/hpa.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
kcore "k8s.io/api/core/v1"
2323
kerrors "k8s.io/apimachinery/pkg/api/errors"
2424
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
klabels "k8s.io/apimachinery/pkg/labels"
2526
)
2627

2728
var _hpaTypeMeta = kmeta.TypeMeta{
@@ -139,7 +140,7 @@ func (c *Client) ListHPAs(opts *kmeta.ListOptions) ([]kautoscaling.HorizontalPod
139140

140141
func (c *Client) ListHPAsByLabels(labels map[string]string) ([]kautoscaling.HorizontalPodAutoscaler, error) {
141142
opts := &kmeta.ListOptions{
142-
LabelSelector: LabelSelector(labels),
143+
LabelSelector: klabels.SelectorFromSet(labels).String(),
143144
}
144145
return c.ListHPAs(opts)
145146
}

‎pkg/lib/k8s/ingress.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
kextensions "k8s.io/api/extensions/v1beta1"
2222
kerrors "k8s.io/apimachinery/pkg/api/errors"
2323
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
24-
intstr "k8s.io/apimachinery/pkg/util/intstr"
24+
klabels "k8s.io/apimachinery/pkg/labels"
25+
"k8s.io/apimachinery/pkg/util/intstr"
2526
)
2627

2728
var _ingressTypeMeta = kmeta.TypeMeta{
@@ -145,7 +146,7 @@ func (c *Client) ListIngresses(opts *kmeta.ListOptions) ([]kextensions.Ingress,
145146

146147
func (c *Client) ListIngressesByLabels(labels map[string]string) ([]kextensions.Ingress, error) {
147148
opts := &kmeta.ListOptions{
148-
LabelSelector: LabelSelector(labels),
149+
LabelSelector: klabels.SelectorFromSet(labels).String(),
149150
}
150151
return c.ListIngresses(opts)
151152
}

‎pkg/lib/k8s/job.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
kcore "k8s.io/api/core/v1"
2323
kerrors "k8s.io/apimachinery/pkg/api/errors"
2424
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
klabels "k8s.io/apimachinery/pkg/labels"
2526
)
2627

2728
var _jobTypeMeta = kmeta.TypeMeta{
@@ -136,7 +137,7 @@ func (c *Client) ListJobs(opts *kmeta.ListOptions) ([]kbatch.Job, error) {
136137

137138
func (c *Client) ListJobsByLabels(labels map[string]string) ([]kbatch.Job, error) {
138139
opts := &kmeta.ListOptions{
139-
LabelSelector: LabelSelector(labels),
140+
LabelSelector: klabels.SelectorFromSet(labels).String(),
140141
}
141142
return c.ListJobs(opts)
142143
}

‎pkg/lib/k8s/k8s.go‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,6 @@ func Mem(mem string) kresource.Quantity {
139139
return kresource.MustParse(mem)
140140
}
141141

142-
func LabelSelector(labels map[string]string) string {
143-
if len(labels) == 0 {
144-
return ""
145-
}
146-
147-
terms := make([]string, 0, len(labels))
148-
for key, value := range labels {
149-
terms = append(terms, key+"="+value)
150-
}
151-
152-
return strings.Join(terms, ",")
153-
}
154-
155142
func LabelExistsSelector(labelKeys ...string) string {
156143
if len(labelKeys) == 0 {
157144
return ""

‎pkg/lib/k8s/node.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/cortexlabs/cortex/pkg/lib/errors"
2121
kcore "k8s.io/api/core/v1"
2222
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
23+
klabels "k8s.io/apimachinery/pkg/labels"
2324
)
2425

2526
var _nodeTypeMeta = kmeta.TypeMeta{
@@ -43,7 +44,7 @@ func (c *Client) ListNodes(opts *kmeta.ListOptions) ([]kcore.Node, error) {
4344

4445
func (c *Client) ListNodesByLabels(labels map[string]string) ([]kcore.Node, error) {
4546
opts := &kmeta.ListOptions{
46-
LabelSelector: LabelSelector(labels),
47+
LabelSelector: klabels.SelectorFromSet(labels).String(),
4748
}
4849
return c.ListNodes(opts)
4950
}

‎pkg/lib/k8s/pod.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
kcore "k8s.io/api/core/v1"
2727
kerrors "k8s.io/apimachinery/pkg/api/errors"
2828
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
29+
klabels "k8s.io/apimachinery/pkg/labels"
2930
kscheme "k8s.io/client-go/kubernetes/scheme"
3031
kremotecommand "k8s.io/client-go/tools/remotecommand"
3132
)
@@ -302,7 +303,7 @@ func (c *Client) ListPods(opts *kmeta.ListOptions) ([]kcore.Pod, error) {
302303

303304
func (c *Client) ListPodsByLabels(labels map[string]string) ([]kcore.Pod, error) {
304305
opts := &kmeta.ListOptions{
305-
LabelSelector: LabelSelector(labels),
306+
LabelSelector: klabels.SelectorFromSet(labels).String(),
306307
}
307308
return c.ListPods(opts)
308309
}

‎pkg/lib/k8s/service.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
kcore "k8s.io/api/core/v1"
2222
kerrors "k8s.io/apimachinery/pkg/api/errors"
2323
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
24-
intstr "k8s.io/apimachinery/pkg/util/intstr"
24+
klabels "k8s.io/apimachinery/pkg/labels"
25+
"k8s.io/apimachinery/pkg/util/intstr"
2526
)
2627

2728
var _serviceTypeMeta = kmeta.TypeMeta{
@@ -134,7 +135,7 @@ func (c *Client) ListServices(opts *kmeta.ListOptions) ([]kcore.Service, error)
134135

135136
func (c *Client) ListServicesByLabels(labels map[string]string) ([]kcore.Service, error) {
136137
opts := &kmeta.ListOptions{
137-
LabelSelector: LabelSelector(labels),
138+
LabelSelector: klabels.SelectorFromSet(labels).String(),
138139
}
139140
return c.ListServices(opts)
140141
}

‎pkg/lib/k8s/virtual_service.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
kerrors "k8s.io/apimachinery/pkg/api/errors"
2424
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
26+
klabels "k8s.io/apimachinery/pkg/labels"
2627
kschema "k8s.io/apimachinery/pkg/runtime/schema"
2728
)
2829

@@ -187,7 +188,7 @@ func (c *Client) ListVirtualServices(opts *kmeta.ListOptions) ([]kunstructured.U
187188

188189
func (c *Client) ListVirtualServicesByLabels(labels map[string]string) ([]kunstructured.Unstructured, error) {
189190
opts := &kmeta.ListOptions{
190-
LabelSelector: LabelSelector(labels),
191+
LabelSelector: klabels.SelectorFromSet(labels).String(),
191192
}
192193
return c.ListVirtualServices(opts)
193194
}

0 commit comments

Comments
 (0)