Skip to content

Commit c2c7ea4

Browse files
gkechhorsnmarukovich
authored
K8SPS-475 don't include expose labels to selector (#1001)
* K8SPS-475 don't include expose labels to selector * additions and fixes * fix orchestrator selector * dont keep old metadata for services, rely only on the ignore mechanism * remove false to ensure service * remove labels from selector * fix router and haproxy selector --------- Co-authored-by: Viacheslav Sarzhan <[email protected]> Co-authored-by: Natalia Marukovich <[email protected]>
1 parent 13af0e1 commit c2c7ea4

File tree

18 files changed

+701
-33
lines changed

18 files changed

+701
-33
lines changed

‎api/v1alpha1/perconaservermysql_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ type ServiceExpose struct {
502502
ExternalTrafficPolicy corev1.ServiceExternalTrafficPolicyType `json:"externalTrafficPolicy,omitempty"`
503503
}
504504

505-
// Determines if both annotations and labels of the service expose are empty.
505+
// SaveOldMeta determines if both annotations and labels of the service expose are empty.
506506
func (e *ServiceExpose) SaveOldMeta() bool {
507507
return len(e.Annotations) == 0 && len(e.Labels) == 0
508508
}

‎e2e-tests/tests/async-ignore-annotations/04-assert.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ spec:
5252
app.kubernetes.io/name: mysql
5353
app.kubernetes.io/part-of: percona-server
5454
app.kubernetes.io/version: v0.12.0
55-
rack: rack-22
56-
rack-test: rack-test-22
5755
sessionAffinity: None
5856
type: ClusterIP
5957
---
@@ -113,8 +111,6 @@ spec:
113111
app.kubernetes.io/name: haproxy
114112
app.kubernetes.io/part-of: percona-server
115113
app.kubernetes.io/version: v0.12.0
116-
rack: rack-22
117-
rack-test: rack-test-22
118114
sessionAffinity: None
119115
type: ClusterIP
120116
---
@@ -163,7 +159,5 @@ spec:
163159
app.kubernetes.io/name: orchestrator
164160
app.kubernetes.io/part-of: percona-server
165161
app.kubernetes.io/version: v0.12.0
166-
rack: rack-22
167-
rack-test: rack-test-22
168162
sessionAffinity: None
169163
type: ClusterIP

‎e2e-tests/tests/async-ignore-annotations/05-assert.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ spec:
5050
app.kubernetes.io/name: mysql
5151
app.kubernetes.io/part-of: percona-server
5252
app.kubernetes.io/version: v0.12.0
53-
rack: rack-22
5453
sessionAffinity: None
5554
type: ClusterIP
5655
---
@@ -108,7 +107,6 @@ spec:
108107
app.kubernetes.io/name: haproxy
109108
app.kubernetes.io/part-of: percona-server
110109
app.kubernetes.io/version: v0.12.0
111-
rack: rack-22
112110
sessionAffinity: None
113111
type: ClusterIP
114112
---
@@ -155,6 +153,5 @@ spec:
155153
app.kubernetes.io/name: orchestrator
156154
app.kubernetes.io/part-of: percona-server
157155
app.kubernetes.io/version: v0.12.0
158-
rack: rack-22
159156
sessionAffinity: None
160157
type: ClusterIP

‎e2e-tests/tests/async-ignore-annotations/06-assert.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ spec:
4949
app.kubernetes.io/managed-by: percona-server-mysql-operator
5050
app.kubernetes.io/name: mysql
5151
app.kubernetes.io/part-of: percona-server
52-
rack: rack-22-test
5352
sessionAffinity: None
5453
type: ClusterIP
5554
---
@@ -107,7 +106,6 @@ spec:
107106
app.kubernetes.io/name: haproxy
108107
app.kubernetes.io/part-of: percona-server
109108
app.kubernetes.io/version: v0.12.0
110-
rack: rack-22-test
111109
sessionAffinity: None
112110
type: ClusterIP
113111
---
@@ -154,6 +152,5 @@ spec:
154152
app.kubernetes.io/name: orchestrator
155153
app.kubernetes.io/part-of: percona-server
156154
app.kubernetes.io/version: v0.12.0
157-
rack: rack-22-test
158155
sessionAffinity: None
159156
type: ClusterIP

‎e2e-tests/tests/async-ignore-annotations/07-assert.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ spec:
4848
app.kubernetes.io/name: mysql
4949
app.kubernetes.io/part-of: percona-server
5050
app.kubernetes.io/version: v0.12.0
51-
rack: rack-22-test
5251
sessionAffinity: None
5352
type: ClusterIP
5453
---
@@ -104,7 +103,6 @@ spec:
104103
app.kubernetes.io/name: haproxy
105104
app.kubernetes.io/part-of: percona-server
106105
app.kubernetes.io/version: v0.12.0
107-
rack: rack-22-test
108106
sessionAffinity: None
109107
type: ClusterIP
110108
---
@@ -149,7 +147,6 @@ spec:
149147
app.kubernetes.io/name: orchestrator
150148
app.kubernetes.io/part-of: percona-server
151149
app.kubernetes.io/version: v0.12.0
152-
rack: rack-22-test
153150
sessionAffinity: None
154151
type: ClusterIP
155152

‎e2e-tests/tests/gr-ignore-annotations/04-assert.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ spec:
5656
app.kubernetes.io/name: mysql
5757
app.kubernetes.io/part-of: percona-server
5858
app.kubernetes.io/version: v0.12.0
59-
rack-test: rack-test-22
60-
rack: rack-22
6159
sessionAffinity: None
6260
type: LoadBalancer
6361
---
@@ -126,7 +124,5 @@ spec:
126124
app.kubernetes.io/name: router
127125
app.kubernetes.io/part-of: percona-server
128126
app.kubernetes.io/version: v0.12.0
129-
rack-test: rack-test-22
130-
rack: rack-22
131127
sessionAffinity: None
132128
type: LoadBalancer

‎e2e-tests/tests/gr-ignore-annotations/05-assert.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ spec:
5454
app.kubernetes.io/name: mysql
5555
app.kubernetes.io/part-of: percona-server
5656
app.kubernetes.io/version: v0.12.0
57-
rack: rack-22
5857
sessionAffinity: None
5958
type: LoadBalancer
6059
---
@@ -121,6 +120,5 @@ spec:
121120
app.kubernetes.io/name: router
122121
app.kubernetes.io/part-of: percona-server
123122
app.kubernetes.io/version: v0.12.0
124-
rack: rack-22
125123
sessionAffinity: None
126124
type: LoadBalancer

‎e2e-tests/tests/gr-ignore-annotations/06-assert.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ spec:
5454
app.kubernetes.io/name: mysql
5555
app.kubernetes.io/part-of: percona-server
5656
app.kubernetes.io/version: v0.12.0
57-
rack: rack-22-test
5857
sessionAffinity: None
5958
type: LoadBalancer
6059
---
@@ -121,6 +120,5 @@ spec:
121120
app.kubernetes.io/name: router
122121
app.kubernetes.io/part-of: percona-server
123122
app.kubernetes.io/version: v0.12.0
124-
rack: rack-22-test
125123
sessionAffinity: None
126124
type: LoadBalancer

‎e2e-tests/tests/gr-ignore-annotations/07-assert.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ spec:
5252
app.kubernetes.io/name: mysql
5353
app.kubernetes.io/part-of: percona-server
5454
app.kubernetes.io/version: v0.12.0
55-
rack: rack-22-test
5655
sessionAffinity: None
5756
type: LoadBalancer
5857
---
@@ -117,6 +116,5 @@ spec:
117116
app.kubernetes.io/name: router
118117
app.kubernetes.io/part-of: percona-server
119118
app.kubernetes.io/version: v0.12.0
120-
rack: rack-22-test
121119
sessionAffinity: None
122120
type: LoadBalancer

‎pkg/haproxy/haproxy.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ func Service(cr *apiv1alpha1.PerconaServerMySQL, secret *corev1.Secret) *corev1.
6161
labels := MatchLabels(cr)
6262
labels = util.SSMapMerge(expose.Labels, labels)
6363

64+
selector := MatchLabels(cr)
65+
6466
serviceType := cr.Spec.Proxy.HAProxy.Expose.Type
6567

6668
var loadBalancerSourceRanges []string
@@ -117,7 +119,7 @@ func Service(cr *apiv1alpha1.PerconaServerMySQL, secret *corev1.Secret) *corev1.
117119
Spec: corev1.ServiceSpec{
118120
Type: serviceType,
119121
Ports: ports,
120-
Selector: labels,
122+
Selector: selector,
121123
LoadBalancerSourceRanges: loadBalancerSourceRanges,
122124
InternalTrafficPolicy: expose.InternalTrafficPolicy,
123125
ExternalTrafficPolicy: externalTrafficPolicy,

0 commit comments

Comments
 (0)