Setting appProtocol for service objects

percona · May 2, 2024 · ce90c23 · ce90c23
1 parent c030956
commit ce90c23
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1160.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1160.yml
@@ -15,7 +15,8 @@ metadata:
       name: some-name
 spec:
   ports:
-    - name: mongodb
+    - appProtocol: mongo
+      name: mongodb
       port: 27017
       protocol: TCP
       targetPort: 27017

diff --git a/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1160.yml b/e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1160.yml
@@ -15,7 +15,8 @@ metadata:
       name: some-name
 spec:
   ports:
-    - name: mongodb
+    - appProtocol: mongo
+      name: mongodb
       port: 27017
       protocol: TCP
       targetPort: 27017

diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1160.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1160.yml
@@ -15,7 +15,8 @@ metadata:
       name: some-name
 spec:
   ports:
-    - name: mongodb
+    - appProtocol: mongo
+      name: mongodb
       port: 27017
       protocol: TCP
       targetPort: 27017

diff --git a/pkg/psmdb/service.go b/pkg/psmdb/service.go
@@ -28,7 +28,7 @@ func Service(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec) *corev1.Ser
 		"app.kubernetes.io/managed-by": "percona-server-mongodb-operator",
 		"app.kubernetes.io/part-of":    "percona-server-mongodb",
 	}
-	appProtocol := "mongo"
+
 	svc := &corev1.Service{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
@@ -42,10 +42,9 @@ func Service(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec) *corev1.Ser
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
 				{
-					Name:        mongodPortName,
-					Port:        api.DefaultMongodPort,
-					TargetPort:  intstr.FromInt(int(api.DefaultMongodPort)),
-					AppProtocol: &appProtocol,
+					Name:       mongodPortName,
+					Port:       api.DefaultMongodPort,
+					TargetPort: intstr.FromInt(int(api.DefaultMongodPort)),
 				},
 			},
 			ClusterIP: "None",
@@ -64,7 +63,12 @@ func Service(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec) *corev1.Ser
 			}
 		}
 	}
-
+	if cr.CompareVersion("1.16.0") >= 0 {
+		appProtocol := "mongo"
+		for _, v := range svc.Spec.Ports {
+			v.AppProtocol = &appProtocol
+		}
+	}
 	return svc
 }
 
@@ -119,7 +123,12 @@ func ExternalService(cr *api.PerconaServerMongoDB, replset *api.ReplsetSpec, pod
 	default:
 		svc.Spec.Type = corev1.ServiceTypeClusterIP
 	}
-
+	if cr.CompareVersion("1.16.0") >= 0 {
+		appProtocol := "mongo"
+		for _, v := range svc.Spec.Ports {
+			v.AppProtocol = &appProtocol
+		}
+	}
 	return svc
 }