Skip to content

PodMonitors: use port (name) and portNumber properly #599

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
merged 3 commits into from
Apr 25, 2025
Merged

PodMonitors: use port (name) and portNumber properly #599

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06fc3be
use port (name) and portNumber properly
eberlep Apr 25, 2025
8d9051d
Refactor
eberlep Apr 25, 2025
1ca780b
Add targetPort as well
eberlep Apr 25, 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
7 changes: 4 additions & 3 deletions controllers/postgres_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const (
podMonitorName string = "patroni"
walGExporterName string = "wal-g-exporter"
walGExporterPort int32 = 9351
podMonitorPort string = "8008"
podMonitorPort int32 = 8008
initDBName string = "postgres-initdb"
initDBSQLDummy string = `SELECT 'NOOP';`
debugLogLevel int = 1
Expand Down Expand Up @@ -1688,7 +1688,8 @@ func (r *PostgresReconciler) createOrUpdatePatroniPodMonitor(ctx context.Context

pm.Spec.PodMetricsEndpoints = []coreosv1.PodMetricsEndpoint{
{
Port: ptr.To(podMonitorPort),
PortNumber: ptr.To(podMonitorPort),
TargetPort: ptr.To(intstr.FromInt32(podMonitorPort)),
},
}
pm.Spec.NamespaceSelector = coreosv1.NamespaceSelector{
Expand Down Expand Up @@ -2241,7 +2242,7 @@ func (r *PostgresReconciler) createOrUpdateWalGExporterPodMonitor(log logr.Logge

s.Spec.PodMetricsEndpoints = []coreosv1.PodMetricsEndpoint{
{
Port: ptr.To(strconv.Itoa(int(walGExporterPort))),
Port: ptr.To(walGExporterName),
},
}
selector := map[string]string{
Expand Down
Loading