Skip to content

Commit 617adc2

Browse files
remove rw balancer
1 parent 11cb9e2 commit 617adc2

File tree

5 files changed

+3
-27
lines changed

5 files changed

+3
-27
lines changed

charts/victoria-metrics-distributed/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
**Update note**: This release contains breaking changes. Please follow [upgrade guide](https://docs.victoriametrics.com/helm/victoria-metrics-distributed/#upgrade-to-0240)
44

5-
- added `rw` global balancer, that accepts both write and read traffic.
65
- enable ingest only mode for VMAgents. See [#1594](https://github.com/VictoriaMetrics/operator/issues/1594).
76

87
## 0.23.0

charts/victoria-metrics-distributed/templates/NOTES.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,3 @@ Global read endpoint is available now!
1111
{{- $_ := set $ctx "appKey" (list "read" "global" "vmauth") }}
1212
You can use `{{ include "vm.url" $ctx }}/select/<accountID>/prometheus/<suffix>` as datasource of vmalert or grafana, check more supported APIs [here](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/#url-format).
1313
{{- end }}
14-
{{ if (((.Values.rw).global).vmauth).enabled }}
15-
Global read/write endpoint is available now!
16-
{{- $_ := set $ctx "appKey" (list "rw" "global" "vmauth") }}
17-
You can use:
18-
- `{{ include "vm.url" $ctx }}/select/<accountID>/prometheus/<suffix>` as datasource of vmalert or grafana, check more supported APIs [here](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/#url-format).
19-
- `{{ include "vm.url" $ctx }}/prometheus/api/v1/write` as write destination for your client like vmagent, check more supported APIs [here](https://docs.victoriametrics.com/victoriametrics/vmagent/#how-to-push-data-to-vmagent).
20-
{{- end }}

charts/victoria-metrics-distributed/templates/vmagent.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
{{- $fullname := include "vm.fullname" . }}
1717
{{- $urlCtx := dict "helm" . "appKey" (list "globalWrite" "vmauth" "spec") "globalWrite" (dict "vmauth" $write) "style" "managed" "fullname" $fullname }}
1818
{{- $urls = append $urls (printf "%s/prometheus/api/v1/write" (include "vm.url" $urlCtx)) }}
19-
{{- else if $values.rw.global.vmauth.enabled }}
20-
{{- $write := deepCopy (($values.rw).global).vmauth }}
21-
{{- $_ := set $write "spec" (mergeOverwrite (deepCopy $common.vmauth.spec) $write.spec) }}
22-
{{- $fullname := include "vm.fullname" . }}
23-
{{- $urlCtx := dict "helm" . "appKey" (list "globalWrite" "vmauth" "spec") "globalWrite" (dict "vmauth" $write) "style" "managed" "fullname" $fullname }}
24-
{{- $urls = append $urls (printf "%s/prometheus/api/v1/write" (include "vm.url" $urlCtx)) }}
2519
{{- else }}
2620
{{- range $i, $z := $values.availabilityZones }}
2721
{{- $zone := mergeOverwrite (deepCopy $zoneTpl) $z }}

charts/victoria-metrics-distributed/templates/vmauth.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{- $common := $values.common | default dict }}
55
{{- $zoneTpl := $values.zoneTpl }}
66
{{- $fullname := include "vm.fullname" . }}
7-
{{- $kinds := list "read" "write" "rw" }}
7+
{{- $kinds := list "read" "write" }}
88
{{- $defaultUrlMapItem := $values.defaultUrlMapItem }}
99
{{- range $kind := $kinds }}
1010
{{- $auth := index $values $kind "global" "vmauth" | default dict }}
@@ -30,7 +30,7 @@ metadata:
3030
{{- $urls := dict "vmcluster" (default list) "vmsingle" (default list) "vmagent" (default list) }}
3131
{{- range $i, $z := $values.availabilityZones }}
3232
{{- $zone := mergeOverwrite (deepCopy $zoneTpl) $z }}
33-
{{- if has $kind (list "read" "rw") -}}
33+
{{- if has $kind (list "read") -}}
3434
{{- if $zone.read.vmauth.enabled -}}
3535
{{- $urlSpec := (($zone.read).vmauth).spec | default dict }}
3636
{{- $_ := set $zone.read.vmauth "spec" (mergeOverwrite (deepCopy $commonAuth.spec) $urlSpec) }}
@@ -55,7 +55,7 @@ metadata:
5555
{{- $_ := set $urls "vmsingle" (append $urls.vmsingle (include "vm.url" $urlCtx)) }}
5656
{{- end -}}
5757
{{- end -}}
58-
{{- if has $kind (list "write" "rw") -}}
58+
{{- if has $kind (list "write") -}}
5959
{{- if $zone.vmagent.enabled -}}
6060
{{- $agentSpec := $zone.vmagent.spec | default dict }}
6161
{{- $_ := set $zone.vmagent "spec" (mergeOverwrite (deepCopy $commonAgent.spec) $agentSpec) }}

charts/victoria-metrics-distributed/values.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,6 @@ defaultUrlMapItem:
7070
src_paths:
7171
- /select/.+
7272

73-
rw:
74-
global:
75-
vmauth:
76-
# -- Enable single global VMAuth for reads and writes.
77-
enabled: false
78-
# -- Override the name of the vmauth object
79-
name: "global-rw-{{ .fullname }}"
80-
# -- Spec for VMAuth CRD, see [here](https://docs.victoriametrics.com/operator/api/#vmauthspec)
81-
spec: {}
82-
8373
write:
8474
global:
8575
vmauth:

0 commit comments

Comments
 (0)