Skip to content

K8SPSMDB-1062: Setting appProtocol for service objects #1393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sorenmat wants to merge 13 commits into
base: main
Choose a base branch
from
+139 −94
Open

K8SPSMDB-1062: Setting appProtocol for service objects #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
72a4d55
Setting appProtocol for service objects
sorenmat Dec 14, 2023
7b414d1
Setting appProtocol for service objects
sorenmat Dec 14, 2023
d68794c
Merge remote-tracking branch 'origin/main' into appProtocol
pooknull Dec 16, 2025
ad7a372
update compare version
pooknull Dec 16, 2025
61b8916
small improvement
pooknull Dec 16, 2025
143ac51
fix unit-test
pooknull Dec 16, 2025
c7a038e
change `mongo` to `mongodb`
pooknull Dec 16, 2025
680a8bd
add appProtocol to mongos service and fix tests
pooknull Dec 16, 2025
d9c92c1
fix unit-tests
pooknull Dec 16, 2025
a2524ed
fix unit-test
pooknull Dec 16, 2025
0e23bf2
fix `TestReconcileReplsetServices`
pooknull Dec 16, 2025
2034f48
switch back to `mongo`
pooknull Dec 16, 2025
371bdb6
fix init-deploy
pooknull Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-crmeta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-cfg-0-no-ignored-meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion ...gnore-labels-annotations/compare/service_some-name-cfg-0-one-service-label-annotation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion ...ore-labels-annotations/compare/service_some-name-cfg-0-two-service-labels-annotations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-mongos-0-crmeta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-mongos-0-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-mongos-0-no-ignored-meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion ...re-labels-annotations/compare/service_some-name-mongos-0-one-service-label-annotation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion ...-labels-annotations/compare/service_some-name-mongos-0-two-service-labels-annotations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-rs0-0-crmeta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-rs0-0-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/ignore-labels-annotations/compare/service_some-name-rs0-0-no-ignored-meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion ...gnore-labels-annotations/compare/service_some-name-rs0-0-one-service-label-annotation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion ...ore-labels-annotations/compare/service_some-name-rs0-0-two-service-labels-annotations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/init-deploy/compare/service_another-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: another-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/init-deploy/compare/service_some-name-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/monitoring-2-0/compare/service_monitoring-mongos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ metadata:
name: monitoring
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27019
protocol: TCP
targetPort: 27019
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/monitoring-2-0/compare/service_monitoring-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: monitoring
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27019
protocol: TCP
targetPort: 27019
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/monitoring-pmm3/compare/service_monitoring-pmm3-mongos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ metadata:
name: monitoring-pmm3
spec:
ports:
- name: mongos
- appProtocol: mongo
name: mongos
port: 27019
protocol: TCP
targetPort: 27019
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/monitoring-pmm3/compare/service_monitoring-pmm3-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: monitoring-pmm3
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27019
protocol: TCP
targetPort: 27019
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/one-pod/compare/service_one-pod-rs0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ metadata:
name: one-pod
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/service-per-pod/compare/service_cluster-ip-rs0-0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ metadata:
name: cluster-ip
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/service-per-pod/compare/service_local-balancer-rs0-0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ metadata:
spec:
externalTrafficPolicy: Local
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/service-per-pod/compare/service_node-port-rs0-0-updated.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ metadata:
spec:
externalTrafficPolicy: Cluster
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/service-per-pod/compare/service_node-port-rs0-0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ metadata:
spec:
externalTrafficPolicy: Cluster
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-cfg-1220.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/upgrade-consistency-sharded-tls/compare/service_some-name-rs0-1220.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
3 changes: 2 additions & 1 deletion e2e-tests/upgrade-consistency/compare/service_some-name-rs0-1220.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ metadata:
name: some-name
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
protocol: TCP
targetPort: 27017
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/perconaservermongodb/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func TestReconcileReplsetServices(t *testing.T) {
for i := range svcList.Items {
svcList.Items[i].APIVersion = "v1"
svcList.Items[i].Kind = "Service"
delete(svcList.Items[i].Annotations, "percona.com/last-config-hash")
}

yamlCompare(t, ns, filename, svcList)
Expand Down
5 changes: 2 additions & 3 deletions pkg/controller/perconaservermongodb/testdata/rs-svc/svc_list_expose_off.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ items:
- apiVersion: v1
kind: Service
metadata:
annotations:
percona.com/last-config-hash: eyJwb3J0cyI6W3sibmFtZSI6Im1vbmdvZGIiLCJwb3J0IjoyNzAxNywidGFyZ2V0UG9ydCI6MjcwMTd9XSwic2VsZWN0b3IiOnsiYXBwLmt1YmVybmV0ZXMuaW8vaW5zdGFuY2UiOiJycy1zdmMiLCJhcHAua3ViZXJuZXRlcy5pby9tYW5hZ2VkLWJ5IjoicGVyY29uYS1zZXJ2ZXItbW9uZ29kYi1vcGVyYXRvciIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJwZXJjb25hLXNlcnZlci1tb25nb2RiIiwiYXBwLmt1YmVybmV0ZXMuaW8vcGFydC1vZiI6InBlcmNvbmEtc2VydmVyLW1vbmdvZGIiLCJhcHAua3ViZXJuZXRlcy5pby9yZXBsc2V0IjoicnMwIn0sImNsdXN0ZXJJUCI6Ik5vbmUifQ==
labels:
app.kubernetes.io/instance: rs-svc
app.kubernetes.io/managed-by: percona-server-mongodb-operator
Expand All @@ -22,7 +20,8 @@ items:
spec:
clusterIP: None
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
targetPort: 27017
selector:
Expand Down
20 changes: 8 additions & 12 deletions pkg/controller/perconaservermongodb/testdata/rs-svc/svc_list_expose_on.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ items:
- apiVersion: v1
kind: Service
metadata:
annotations:
percona.com/last-config-hash: eyJwb3J0cyI6W3sibmFtZSI6Im1vbmdvZGIiLCJwb3J0IjoyNzAxNywidGFyZ2V0UG9ydCI6MjcwMTd9XSwic2VsZWN0b3IiOnsiYXBwLmt1YmVybmV0ZXMuaW8vaW5zdGFuY2UiOiJycy1zdmMiLCJhcHAua3ViZXJuZXRlcy5pby9tYW5hZ2VkLWJ5IjoicGVyY29uYS1zZXJ2ZXItbW9uZ29kYi1vcGVyYXRvciIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJwZXJjb25hLXNlcnZlci1tb25nb2RiIiwiYXBwLmt1YmVybmV0ZXMuaW8vcGFydC1vZiI6InBlcmNvbmEtc2VydmVyLW1vbmdvZGIiLCJhcHAua3ViZXJuZXRlcy5pby9yZXBsc2V0IjoicnMwIn0sImNsdXN0ZXJJUCI6Ik5vbmUifQ==
labels:
app.kubernetes.io/instance: rs-svc
app.kubernetes.io/managed-by: percona-server-mongodb-operator
Expand All @@ -22,7 +20,8 @@ items:
spec:
clusterIP: None
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
targetPort: 27017
selector:
Expand All @@ -36,8 +35,6 @@ items:
- apiVersion: v1
kind: Service
metadata:
annotations:
percona.com/last-config-hash: eyJwb3J0cyI6W3sibmFtZSI6Im1vbmdvZGIiLCJwb3J0IjoyNzAxNywidGFyZ2V0UG9ydCI6MjcwMTd9XSwic2VsZWN0b3IiOnsic3RhdGVmdWxzZXQua3ViZXJuZXRlcy5pby9wb2QtbmFtZSI6InJzLXN2Yy1yczAtMCJ9LCJ0eXBlIjoiQ2x1c3RlcklQIiwicHVibGlzaE5vdFJlYWR5QWRkcmVzc2VzIjp0cnVlfQ==
labels:
app.kubernetes.io/component: external-service
app.kubernetes.io/instance: rs-svc
Expand All @@ -56,7 +53,8 @@ items:
resourceVersion: "1"
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
targetPort: 27017
publishNotReadyAddresses: true
Expand All @@ -68,8 +66,6 @@ items:
- apiVersion: v1
kind: Service
metadata:
annotations:
percona.com/last-config-hash: eyJwb3J0cyI6W3sibmFtZSI6Im1vbmdvZGIiLCJwb3J0IjoyNzAxNywidGFyZ2V0UG9ydCI6MjcwMTd9XSwic2VsZWN0b3IiOnsic3RhdGVmdWxzZXQua3ViZXJuZXRlcy5pby9wb2QtbmFtZSI6InJzLXN2Yy1yczAtMSJ9LCJ0eXBlIjoiQ2x1c3RlcklQIiwicHVibGlzaE5vdFJlYWR5QWRkcmVzc2VzIjp0cnVlfQ==
labels:
app.kubernetes.io/component: external-service
app.kubernetes.io/instance: rs-svc
Expand All @@ -88,7 +84,8 @@ items:
resourceVersion: "1"
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
targetPort: 27017
publishNotReadyAddresses: true
Expand All @@ -100,8 +97,6 @@ items:
- apiVersion: v1
kind: Service
metadata:
annotations:
percona.com/last-config-hash: eyJwb3J0cyI6W3sibmFtZSI6Im1vbmdvZGIiLCJwb3J0IjoyNzAxNywidGFyZ2V0UG9ydCI6MjcwMTd9XSwic2VsZWN0b3IiOnsic3RhdGVmdWxzZXQua3ViZXJuZXRlcy5pby9wb2QtbmFtZSI6InJzLXN2Yy1yczAtMiJ9LCJ0eXBlIjoiQ2x1c3RlcklQIiwicHVibGlzaE5vdFJlYWR5QWRkcmVzc2VzIjp0cnVlfQ==
labels:
app.kubernetes.io/component: external-service
app.kubernetes.io/instance: rs-svc
Expand All @@ -120,7 +115,8 @@ items:
resourceVersion: "1"
spec:
ports:
- name: mongodb
- appProtocol: mongo
name: mongodb
port: 27017
targetPort: 27017
publishNotReadyAddresses: true
Expand Down
Loading
Loading