Skip to content

Commit ed493dc

Browse files
committed
Setting appProtocol for service objects
1 parent 1d90e1e commit ed493dc

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

e2e-tests/upgrade-consistency-sharded/compare/service_some-name-rs0-1150.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ metadata:
1515
name: some-name
1616
spec:
1717
ports:
18-
- name: mongodb
18+
- appProtocol: mongo
19+
name: mongodb
1920
port: 27017
2021
protocol: TCP
2122
targetPort: 27017

pkg/psmdb/service.go

+10-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func Service(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec) *corev1.Ser
2828
"app.kubernetes.io/managed-by": "percona-server-mongodb-operator",
2929
"app.kubernetes.io/part-of": "percona-server-mongodb",
3030
}
31-
appProtocol := "mongo"
31+
3232
svc := &corev1.Service{
3333
TypeMeta: metav1.TypeMeta{
3434
APIVersion: "v1",
@@ -42,10 +42,9 @@ func Service(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec) *corev1.Ser
4242
Spec: corev1.ServiceSpec{
4343
Ports: []corev1.ServicePort{
4444
{
45-
Name: mongodPortName,
46-
Port: api.DefaultMongodPort,
47-
TargetPort: intstr.FromInt(int(api.DefaultMongodPort)),
48-
AppProtocol: &appProtocol,
45+
Name: mongodPortName,
46+
Port: api.DefaultMongodPort,
47+
TargetPort: intstr.FromInt(int(api.DefaultMongodPort)),
4948
},
5049
},
5150
ClusterIP: "None",
@@ -64,7 +63,12 @@ func Service(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec) *corev1.Ser
6463
}
6564
}
6665
}
67-
66+
if cr.CompareVersion("1.16.0") < 0 {
67+
appProtocol := "mongo"
68+
for _, v := range svc.Spec.Ports {
69+
v.AppProtocol = &appProtocol
70+
}
71+
}
6872
return svc
6973
}
7074

0 commit comments

Comments
 (0)