Skip to content
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

Jump to bottom

Helm: Support https for serviceAccounts and InternalTrafficPolicy for services. #6383

Merged
merged 12 commits into from
Feb 20, 2024
Merged

Helm: Support https for serviceAccounts and InternalTrafficPolicy for services. #6383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b0497d0
apply scheme to service monitor
captncraig Feb 17, 2024
f1013b2
enable tlsConfig in servicemonitor
captncraig Feb 17, 2024
3401a14
test for tlsConfig
captncraig Feb 17, 2024
24450f3
fix indent
captncraig Feb 17, 2024
bd0f88a
support internalTrafficPolicy
captncraig Feb 17, 2024
bba6118
changelog and helm release
captncraig Feb 17, 2024
0ded46a
chart version
captncraig Feb 17, 2024
2caf266
formatting
captncraig Feb 17, 2024
1c26bd3
spaces
captncraig Feb 17, 2024
4cadbf8
Merge remote-tracking branch 'origin/main' into cmp_helm_up2
captncraig Feb 20, 2024
603227b
undo release?
captncraig Feb 20, 2024
a20fad8
lint
captncraig Feb 20, 2024
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
Prev Previous commit
Next Next commit
enable tlsConfig in servicemonitor
  • Loading branch information
@captncraig
captncraig committed Feb 17, 2024
commit f1013b25f1b6bbbf72410eb4adb466d61625a724
7 changes: 7 additions & 0 deletions operations/helm/charts/grafana-agent/ci/enable-servicemonitor-tls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Test rendering of the chart with the service monitor enabled
agent:
listenScheme: HTTPS
service:
enabled: true
serviceMonitor:
enabled: true
3 changes: 3 additions & 0 deletions operations/helm/charts/grafana-agent/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
relabelings:
{{ tpl (toYaml .Values.serviceMonitor.relabelings | nindent 6) . }}
{{- end }}
{{- with .Values.serviceMonitor.tlsConfig }}
{{- toYaml . | nindent 4 }}
{{- end }}
selector:
matchLabels:
{{- include "grafana-agent.selectorLabels" . | nindent 6 }}
Expand Down
3 changes: 3 additions & 0 deletions operations/helm/charts/grafana-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ serviceMonitor:
# targetLabel: nodename
# replacement: $1
# action: replace

# -- Customize tls parameters for the service monitor
tlsConfig: {}

ingress:
# -- Enables ingress for the agent (faro port)
Expand Down