Skip to content

K8SPSMDB-1032: Added possibility to specify nodeport for mongos expose #1392

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

Merged
hors merged 20 commits into from
Apr 2, 2024
Merged

K8SPSMDB-1032: Added possibility to specify nodeport for mongos expose #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5023cd5
Added possibility to specify nodeport for mongos expose
MikeDevresse Dec 6, 2023
4459f8b
Merge branch 'main' into support-of-nodeport
MikeDevresse Dec 23, 2023
77f8ee8
Merge branch 'main' into support-of-nodeport
hors Jan 16, 2024
61be874
Fix unused variable
MikeDevresse Feb 1, 2024
7eef220
Merge branch 'main' into support-of-nodeport
MikeDevresse Feb 1, 2024
42a98be
Added example in deploy/cr.yaml
MikeDevresse Feb 1, 2024
6318c47
Fix indent
MikeDevresse Feb 1, 2024
4c55c2d
Fix indent
MikeDevresse Feb 1, 2024
4bcdfa5
Fix indent
MikeDevresse Feb 1, 2024
088a6a4
Update CRD to have nodeport
MikeDevresse Feb 2, 2024
30191e6
Merge branch 'main' into support-of-nodeport
MikeDevresse Feb 2, 2024
f2944b9
Added nodeport to cw-bundle
MikeDevresse Feb 2, 2024
b635673
Generated new manifests
MikeDevresse Feb 6, 2024
9c46040
Fix objects not getting replaced
MikeDevresse Feb 8, 2024
074507e
Fix nodeport in the right place
MikeDevresse Feb 8, 2024
8f7e469
Fix port to be in range
MikeDevresse Mar 11, 2024
a5c2c43
Merge branch 'main' into support-of-nodeport
MikeDevresse Mar 11, 2024
af3c6cc
Merge branch 'main' into support-of-nodeport
MikeDevresse Mar 26, 2024
6e1ec5a
Merge branch 'main' into support-of-nodeport
egegunes Mar 29, 2024
cf23e6e
Merge branch 'main' into support-of-nodeport
inelpandzic Apr 1, 2024
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
9 changes: 9 additions & 0 deletions config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3041,6 +3041,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -10231,6 +10234,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -15307,6 +15313,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down
9 changes: 9 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,6 +3680,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -10870,6 +10873,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -15946,6 +15952,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down
1 change: 1 addition & 0 deletions deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ spec:
# service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
# serviceLabels:
# rack: rack-22
# nodePort: 32017
# hostAliases:
# - ip: "10.10.0.2"
# hostnames:
Expand Down
9 changes: 9 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,6 +3680,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -10870,6 +10873,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -15946,6 +15952,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down
9 changes: 9 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,6 +3680,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -10870,6 +10873,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -15946,6 +15952,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down
9 changes: 9 additions & 0 deletions e2e-tests/version-service/conf/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,6 +3680,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -10870,6 +10873,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down Expand Up @@ -15946,6 +15952,9 @@ spec:
items:
type: string
type: array
nodePort:
format: int32
type: integer
serviceAnnotations:
additionalProperties:
type: string
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/psmdb/v1/psmdb_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,7 @@ type Expose struct {
LoadBalancerSourceRanges []string `json:"loadBalancerSourceRanges,omitempty"`
ServiceAnnotations map[string]string `json:"serviceAnnotations,omitempty"`
ServiceLabels map[string]string `json:"serviceLabels,omitempty"`
NodePort int32 `json:"nodePort,omitempty"`
}

func (e *Expose) SaveOldMeta() bool {
Expand Down
6 changes: 6 additions & 0 deletions pkg/psmdb/mongos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,12 @@ func MongosServiceSpec(cr *api.PerconaServerMongoDB, podName string) corev1.Serv
case corev1.ServiceTypeNodePort:
spec.Type = corev1.ServiceTypeNodePort
spec.ExternalTrafficPolicy = "Local"
if !cr.Spec.Sharding.Mongos.Expose.ServicePerPod {
for i, port := range spec.Ports {
port.NodePort = cr.Spec.Sharding.Mongos.Expose.NodePort
spec.Ports[i] = port
}
}
case corev1.ServiceTypeLoadBalancer:
spec.Type = corev1.ServiceTypeLoadBalancer
spec.ExternalTrafficPolicy = "Cluster"
Expand Down