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

[prometheus-adapter] Add sidecar container support #3737

Merged
merged 8 commits into from
Sep 29, 2023
Merged

[prometheus-adapter] Add sidecar container support #3737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5693975
Add sidecar container support
Aug 29, 2023
2151f03
Merge branch 'main' into add-sidecar
rpriyanshu9 Aug 31, 2023
8567dcd
Update deployment.yaml
rpriyanshu9 Sep 7, 2023
fa980d5
Merge branch 'main' into add-sidecar
rpriyanshu9 Sep 27, 2023
1343ca8
Rename sideCarContainers to extraContainers
rpriyanshu9 Sep 27, 2023
3663a2b
Merge branch 'main' into add-sidecar
rpriyanshu9 Sep 27, 2023
a29b4af
Merge branch 'main' into add-sidecar
rpriyanshu9 Sep 28, 2023
9410068
Merge branch 'main' into add-sidecar
rpriyanshu9 Sep 28, 2023
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 charts/prometheus-adapter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus-adapter
version: 4.5.0
version: 4.6.0
appVersion: v0.11.1
description: A Helm chart for k8s prometheus adapter
home: https://github.com/kubernetes-sigs/prometheus-adapter
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-adapter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ spec:
name: volume-serving-cert
readOnly: true
{{- end }}
{{- with .Values.extraContainers }}
{{- toYaml . | nindent 6 }}
{{- end }}
nodeSelector:
{{- toYaml .Values.nodeSelector | nindent 8 }}
affinity:
Expand Down
3 changes: 3 additions & 0 deletions charts/prometheus-adapter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ extraArguments: []
# - --tls-private-key-file=/etc/tls/tls.key
# - --tls-cert-file=/etc/tls/tls.crt

# Additional containers to add to the pod
extraContainers: []

# Any extra volumes
extraVolumes: []
# - name: example-name
Expand Down