operator: Align common instance addr with memberlist advertise addr (#8958)

pull/9040/head
Periklis Tsirakidis 2 years ago committed by GitHub
parent ea8376d0cd
commit 68fa134c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      operator/CHANGELOG.md
  2. 11
      operator/internal/manifests/internal/config/build_test.go
  3. 4
      operator/internal/manifests/internal/config/loki-config.yaml

@ -1,5 +1,6 @@
## Main
- [8958](https://github.com/grafana/loki/pull/8958) **periklis**: Align common instance addr with memberlist advertise addr
- [8998](https://github.com/grafana/loki/pull/8998) **periklis**: Remove static placeholder suffix for openshift bundle
- [8930](https://github.com/grafana/loki/pull/8930) **periklis**: Fix makefile target operatorhub
- [8911](https://github.com/grafana/loki/pull/8911) **aminesnow**: Update LokiStack annotaion on RulerConfig delete

@ -110,6 +110,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -350,6 +351,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -695,6 +697,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -1036,6 +1039,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -1378,6 +1382,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -1758,6 +1763,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -2067,6 +2073,7 @@ limits_config:
query_timeout: 2m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -2490,6 +2497,7 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -2798,6 +2806,7 @@ limits_config:
query_timeout: 2m
memberlist:
abort_if_cluster_join_fails: true
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946
@ -3278,6 +3287,8 @@ limits_config:
query_timeout: 1m
memberlist:
abort_if_cluster_join_fails: true
advertise_addr: ${HASH_RING_INSTANCE_ADDR}
advertise_port: 7946
bind_port: 7946
join_members:
- loki-gossip-ring-lokistack-dev.default.svc.cluster.local:7946

@ -176,6 +176,10 @@ limits_config:
{{- with .GossipRing }}
memberlist:
abort_if_cluster_join_fails: true
{{- with .InstanceAddr }}
advertise_addr: {{ . }}
{{- end }}
advertise_port: {{ .BindPort }}
bind_port: {{ .BindPort }}
join_members:
- {{ .MembersDiscoveryAddr }}:{{ .BindPort }}

Loading…
Cancel
Save