Skip to content
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

Automated cherry pick of #17177: Use the same port for hubble-metrics that is used by #17198

Merged
merged 2 commits into from
Jan 10, 2025
+10 −11
Merged

Automated cherry pick of #17177: Use the same port for hubble-metrics that is used by #17198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e1f3da
Use the same port for hubble-metrics that is used by cilium
kforsthoevel Jan 7, 2025
f35eacc
Update manifestHash after running hack/update-expected.sh
kforsthoevel Jan 7, 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
5 changes: 2 additions & 3 deletions docs/contributing/ports.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ so we can avoid port collisions.

See also pkg/wellknownports/wellknownports.go


| Port | Description |
|------|------------------------------------------|
| ---- | ---------------------------------------- |
| 22 | SSH |
| 443 | Kubernetes API |
| 179 | Calico |
Expand All @@ -31,4 +30,4 @@ See also pkg/wellknownports/wellknownports.go
| 4789 | VXLAN |
| 6942 | Cilium operator prometheus port |
| 9090 | Cilium prometheus port |
| 9091 | Cilium hubble prometheus port |
| 9965 | Cilium hubble prometheus port |
2 changes: 1 addition & 1 deletion pkg/wellknownports/wellknownports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const (
CiliumPrometheusPort = 9090

// CiliumHubblePrometheusPort is the default port where Hubble exposes metrics
CiliumHubblePrometheusPort = 9091
CiliumHubblePrometheusPort = 9965

// VxlanUDP is the port used by VXLAN tunneling over UDP
VxlanUDP = 8472
Expand Down
2 changes: 1 addition & 1 deletion ...ster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ spec:
version: 9.99.0
- id: k8s-1.16
manifest: networking.cilium.io/k8s-1.16-v1.15.yaml
manifestHash: a634b1417a8cda30b27d6167bad863baccffcd5944662aa73f2afee23c3f6d0d
manifestHash: d517037904591938b5a8f391024ed9c561e54f7adc5bf4bfaf243d2a10a4967a
name: networking.cilium.io
needsPKI: true
needsRollingUpdate: all
Expand Down
6 changes: 3 additions & 3 deletions ...data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ data:
hubble-disable-tls: "false"
hubble-listen-address: :4244
hubble-metrics: drop
hubble-metrics-server: :9091
hubble-metrics-server: :9965
hubble-socket-path: /var/run/cilium/hubble.sock
hubble-tls-cert-file: /var/lib/cilium/tls/hubble/server.crt
hubble-tls-client-ca-files: /var/lib/cilium/tls/hubble/client-ca.crt
Expand Down Expand Up @@ -863,8 +863,8 @@ spec:
hostPort: 4244
name: peer-service
protocol: TCP
- containerPort: 9091
hostPort: 9091
- containerPort: 9965
hostPort: 9965
name: hubble-metrics
protocol: TCP
readinessProbe:
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ data:
hubble-tls-key-file: /var/lib/cilium/tls/hubble/server.key
hubble-tls-client-ca-files: /var/lib/cilium/tls/hubble/client-ca.crt
{{ if .Hubble.Metrics }}
hubble-metrics-server: ":9091"
hubble-metrics-server: ":9965"
hubble-metrics:
{{- range .Hubble.Metrics }}
{{ . }}
Expand Down Expand Up @@ -1132,8 +1132,8 @@ spec:
hostPort: 4244
protocol: TCP
{{- if .Hubble.Metrics }}
- containerPort: 9091
hostPort: 9091
- containerPort: 9965
hostPort: 9965
name: hubble-metrics
protocol: TCP
{{- end }}
Expand Down
Loading