diff --git a/docs/contributing/ports.md b/docs/contributing/ports.md index 23a0cadc49eb9..dc3b1a415b152 100644 --- a/docs/contributing/ports.md +++ b/docs/contributing/ports.md @@ -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 | @@ -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 | diff --git a/pkg/wellknownports/wellknownports.go b/pkg/wellknownports/wellknownports.go index 5d43a0038e27f..2228021fe9349 100644 --- a/pkg/wellknownports/wellknownports.go +++ b/pkg/wellknownports/wellknownports.go @@ -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 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index 0fa3edc3d724c..4e620481e7e9a 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -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 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content index e091f89583a32..1214364275313 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-networking.cilium.io-k8s-1.16_content @@ -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 @@ -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: diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template index 0fff996820552..cc8dfac6d5a50 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.15.yaml.template @@ -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 }} {{ . }} @@ -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 }}