Skip to content

Commit

Permalink
Charts: fix the metrics-certs volume of the speaker
Browse files Browse the repository at this point in the history
The creation of the metrics-certs volume is conditioned by FRR mode,
while it should only be conditioned by the presence of the name of the
secret in the values.

Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
  • Loading branch information
fedepaol committed Feb 14, 2024
1 parent e51272c commit 61af215
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions charts/metallb/templates/speaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ spec:
{{- toYaml .Values.speaker.securityContext | nindent 8 }}
{{- end }}
volumes:
{{- if .Values.prometheus.speakerMetricsTLSSecret }}
- name: metrics-certs
secret:
secretName: {{ .Values.prometheus.speakerMetricsTLSSecret }}
{{- end }}
{{- if .Values.speaker.memberlist.enabled }}
- name: memberlist
secret:
Expand All @@ -189,11 +194,6 @@ spec:
emptyDir: {}
- name: metrics
emptyDir: {}
{{- if .Values.prometheus.speakerMetricsTLSSecret }}
- name: metrics-certs
secret:
secretName: {{ .Values.prometheus.speakerMetricsTLSSecret }}
{{- end }}
initContainers:
# Copies the initial config files with the right permissions to the shared volume.
- name: cp-frr-files
Expand Down
3 changes: 1 addition & 2 deletions website/content/release-notes/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ BugFixes:

- Fix the non existing conversion webhook in the Helm CRDs ([PR 2269](https://github.com/metallb/metallb/pull/2269))
- Remove dangling AddressPool leftovers ([PR 2272](https://github.com/metallb/metallb/pull/2272) [Issue 2270](https://github.com/metallb/metallb/issues/2270))
## Next release

- Helm: fix the creation of the metrics-certs volume under the presence of the speakerMetricsTLSSecret value, regardless of FRR being enabled ([PR]())
Chores:

- Add Helm to upgrade documentation ([PR 2268](https://github.com/metallb/metallb/pull/2268))
Expand Down

0 comments on commit 61af215

Please sign in to comment.