Skip to content

Metrics: changed port from 8080 to 8082 #2818

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
adamjensenbot merged 1 commit into from
Dec 5, 2024
Merged

Metrics: changed port from 8080 to 8082 #2818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/liqo-controller-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func main() {

// Manager flags
webhookPort := pflag.Uint("webhook-port", 9443, "The port the webhook server binds to")
metricsAddr := pflag.String("metrics-address", ":8080", "The address the metric endpoint binds to")
metricsAddr := pflag.String("metrics-address", ":8082", "The address the metric endpoint binds to")
probeAddr := pflag.String("health-probe-address", ":8081", "The address the health probe endpoint binds to")
leaderElection := pflag.Bool("enable-leader-election", false, "Enable leader election for controller manager")

Expand Down
2 changes: 1 addition & 1 deletion cmd/virtual-kubelet/root/flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func InstallFlags(flags *pflag.FlagSet, o *Opts) {
flags.StringVar(&o.RemoteRealLoadBalancerClassName, "remote-real-load-balancer-class-name", "",
"Name of the real load balancer class to use for the actual load balancer")
flags.BoolVar(&o.EnableMetrics, "metrics-enabled", false, "Enable the metrics server")
flags.StringVar(&o.MetricsAddress, "metrics-address", ":8080", "The address to listen to for metrics requests")
flags.StringVar(&o.MetricsAddress, "metrics-address", ":8082", "The address to listen to for metrics requests")
flags.StringVar(&o.HomeAPIServerHost, "home-api-server-host", "",
"Home cluster API server HOST, this parameter is optional and required only to override the default values")
flags.StringVar(&o.HomeAPIServerPort, "home-api-server-port", "",
Expand Down
2 changes: 1 addition & 1 deletion cmd/webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func init() {
func main() {
// Manager flags
webhookPort := pflag.Uint("webhook-port", 9443, "The port the webhook server binds to")
metricsAddr := pflag.String("metrics-address", ":8080", "The address the metric endpoint binds to")
metricsAddr := pflag.String("metrics-address", ":8082", "The address the metric endpoint binds to")
probeAddr := pflag.String("health-probe-address", ":8081", "The address the health probe endpoint binds to")
leaderElection := pflag.Bool("enable-leader-election", false, "Enable leader election for the webhook pod")
secretName := pflag.String("secret-name", "", "The name of the secret containing the webhook certificates")
Expand Down
2 changes: 1 addition & 1 deletion deployments/liqo/templates/liqo-controller-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ spec:
containerPort: 8081
protocol: TCP
- name: metrics
containerPort: 8080
containerPort: 8082
protocol: TCP
readinessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion deployments/liqo/templates/liqo-controller-manager-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ spec:
{{- include "liqo.selectorLabels" $ctrlManagerConfig | nindent 4 }}
ports:
- name: metrics
port: 8080
port: 8082
targetPort: metrics
{{- end }}
2 changes: 1 addition & 1 deletion deployments/liqo/templates/liqo-crd-replicator-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
resources: {{- toYaml .Values.crdReplicator.pod.resources | nindent 12 }}
ports:
- name: metrics
containerPort: 8080
containerPort: 8082
protocol: TCP
{{- if ((.Values.common).nodeSelector) }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion deployments/liqo/templates/liqo-webhook-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ spec:
containerPort: 8081
protocol: TCP
- name: metrics
containerPort: 8080
containerPort: 8082
protocol: TCP
readinessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion deployments/liqo/templates/liqo-webhook-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ spec:
{{- end }}
ports:
- name: metrics
port: 8080
port: 8082
targetPort: metrics
{{- end }}
18 changes: 9 additions & 9 deletions deployments/liqo/templates/liqo-wireguard-gateway-client-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ spec:
- --container-name=gateway
- --concurrent-containers-names=wireguard,geneve
{{- if .Values.metrics.enabled }}
- --metrics-address=:8080
- --metrics-address=:8082
{{- end }}
- --health-probe-bind-address=:8081
- --health-probe-bind-address=:8083
- --ping-enabled=true
- --ping-loss-threshold={{ .Values.networking.gatewayTemplates.ping.lossThreshold }}
- --ping-interval={{ .Values.networking.gatewayTemplates.ping.interval }}
Expand All @@ -68,7 +68,7 @@ spec:
mountPath: /ipc
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8080
- containerPort: 8082
name: gw-metrics
{{- end }}
env:
Expand Down Expand Up @@ -100,13 +100,13 @@ spec:
- --endpoint-address={{"{{ index .Spec.Endpoint.Addresses 0 }}"}}
- --endpoint-port={{"{{ .Spec.Endpoint.Port }}"}}
{{- if .Values.metrics.enabled }}
- --metrics-address=:8082
- --metrics-address=:8084
{{- end }}
- --health-probe-bind-address=:8083
- --health-probe-bind-address=:8085
- --implementation={{ .Values.networking.gatewayTemplates.wireguard.implementation }}
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8082
- containerPort: 8084
name: wg-metrics
{{- end }}
securityContext:
Expand Down Expand Up @@ -136,15 +136,15 @@ spec:
- --container-name=geneve
- --geneve-port={{ .Values.networking.genevePort }}
{{- if .Values.metrics.enabled }}
- --metrics-address=:8084
- --metrics-address=:8086
{{- end }}
- --health-probe-bind-address=:8085
- --health-probe-bind-address=:8087
volumeMounts:
- name: ipc
mountPath: /ipc
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8084
- containerPort: 8086
name: gv-metrics
{{- end }}
env:
Expand Down
18 changes: 9 additions & 9 deletions deployments/liqo/templates/liqo-wireguard-gateway-server-template-eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ spec:
- --container-name=gateway
- --concurrent-containers-names=wireguard,geneve
{{- if .Values.metrics.enabled }}
- --metrics-address=:8080
- --metrics-address=:8082
{{- end }}
- --health-probe-bind-address=:8081
- --health-probe-bind-address=:8083
- --ping-enabled=true
- --ping-loss-threshold={{ .Values.networking.gatewayTemplates.ping.lossThreshold }}
- --ping-interval={{ .Values.networking.gatewayTemplates.ping.interval }}
Expand All @@ -95,7 +95,7 @@ spec:
mountPath: /ipc
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8080
- containerPort: 8082
name: gw-metrics
{{- end }}
env:
Expand Down Expand Up @@ -126,13 +126,13 @@ spec:
- --mtu={{"{{ .Spec.MTU }}"}}
- --listen-port={{"{{ .Spec.Endpoint.Port }}"}}
{{- if .Values.metrics.enabled }}
- --metrics-address=:8082
- --metrics-address=:8084
{{- end }}
- --health-probe-bind-address=:8083
- --health-probe-bind-address=:8085
- --implementation={{ .Values.networking.gatewayTemplates.wireguard.implementation }}
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8082
- containerPort: 8084
name: wg-metrics
{{- end }}
securityContext:
Expand Down Expand Up @@ -162,15 +162,15 @@ spec:
- --container-name=geneve
- --geneve-port={{ .Values.networking.genevePort }}
{{- if .Values.metrics.enabled }}
- --metrics-address=:8084
- --metrics-address=:8086
{{- end }}
- --health-probe-bind-address=:8085
- --health-probe-bind-address=:8086
volumeMounts:
- name: ipc
mountPath: /ipc
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8084
- containerPort: 8086
name: gv-metrics
{{- end }}
env:
Expand Down
12 changes: 6 additions & 6 deletions deployments/liqo/templates/liqo-wireguard-gateway-server-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ spec:
- --container-name=gateway
- --concurrent-containers-names=wireguard,geneve
{{- if .Values.metrics.enabled }}
- --metrics-address=:8080
- --metrics-address=:8084
{{- end }}
- --health-probe-bind-address=:8081
- --health-probe-bind-address=:8085
- --ping-enabled=true
- --ping-loss-threshold={{ .Values.networking.gatewayTemplates.ping.lossThreshold }}
- --ping-interval={{ .Values.networking.gatewayTemplates.ping.interval }}
Expand All @@ -88,7 +88,7 @@ spec:
mountPath: /ipc
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8080
- containerPort: 8084
name: gw-metrics
{{- end }}
env:
Expand Down Expand Up @@ -155,15 +155,15 @@ spec:
- --container-name=geneve
- --geneve-port={{ .Values.networking.genevePort }}
{{- if .Values.metrics.enabled }}
- --metrics-address=:8084
- --metrics-address=:8086
{{- end }}
- --health-probe-bind-address=:8085
- --health-probe-bind-address=:8087
volumeMounts:
- name: ipc
mountPath: /ipc
{{- if .Values.metrics.enabled }}
ports:
- containerPort: 8084
- containerPort: 8086
name: gv-metrics
{{- end }}
env:
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-client-default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=client
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-client-high-availability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=client
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-client-pingdisabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=client
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=false
image: ghcr.io/liqotech/gateway:<VERSION>
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-client-selector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=client
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-server-default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=server
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-server-high-availability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=server
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-server-overridetargetport.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=server
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-server-pingdisabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=server
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=false
image: ghcr.io/liqotech/gateway:<VERSION>
Expand Down
2 changes: 1 addition & 1 deletion examples/networking/wireguard-server-selector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
- --remote-cluster-id={{ .ClusterID }}
- --gateway-uid={{ .GatewayUID }}
- --mode=server
- --metrics-address=:8080
- --metrics-address=:8082
- --health-probe-bind-address=:8081
- --ping-enabled=true
- --ping-loss-threshold=5
Expand Down
2 changes: 1 addition & 1 deletion pkg/fabric/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func InitFlags(flagset *pflag.FlagSet, opts *Options) {
flagset.StringVar(&opts.NodeName, FlagNameNodeName.String(), "", "Name of the node where the pod is scheduled")
flagset.StringVar(&opts.PodName, "podname", "", "Name of the pod")

flagset.StringVar(&opts.MetricsAddress, FlagNameMetricsAddress.String(), ":8080", "Address for the metrics endpoint")
flagset.StringVar(&opts.MetricsAddress, FlagNameMetricsAddress.String(), ":8082", "Address for the metrics endpoint")
flagset.StringVar(&opts.ProbeAddr, FlagNameProbeAddr.String(), ":8081", "Address for the health probe endpoint")

flagset.BoolVar(&opts.DisableARP, FlagNameDisableARP.String(), false, "Disable ARP")
Expand Down
2 changes: 1 addition & 1 deletion pkg/vkMachinery/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ var ClusterRoleBindingLabels = map[string]string{
}

// MetricsAddress is the default address used to expose metrics.
const MetricsAddress = ":8080"
const MetricsAddress = ":8082"
Loading