Skip to content

chore(agent,sysdig-deploy): set promscrape port to 9091 by default when gke autopilot is enabled #1618

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

Merged
merged 3 commits into from
Feb 21, 2024
Merged

chore(agent,sysdig-deploy): set promscrape port to 9091 by default when gke autopilot is enabled #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75c5239
chore(agent): set promscrape port to 9091 by default when autopilot i…
francesco-furlan Feb 20, 2024
b6ef020
chore(agent): remove useless promscrape override on configmap-deployment
francesco-furlan Feb 21, 2024
9dbad08
chore: fix test name typo
francesco-furlan Feb 21, 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
2 changes: 1 addition & 1 deletion charts/agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ sources:
- https://app.sysdigcloud.com/#/settings/user
- https://github.com/draios/sysdig
type: application
version: 1.20.1
version: 1.20.2
5 changes: 4 additions & 1 deletion charts/agent/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ data:
Checking here the user is using Custom CA and if http_proxy.ssl = true
If these conditions are true, then we use the agent.sslCaFileName for the http_proxy.ca_certificate
*/}}
{{- $baseSettings := .Values.sysdig.settings -}}
{{- if and (include "agent.gke.autopilot" .) (or (not (hasKey $baseSettings "promscrape_web_address")) (eq (get $baseSettings "promscrape_web_address") "127.0.0.1:9990") ) }}
{{- $baseSettings := mergeOverwrite $baseSettings (dict "promscrape_web_address" "127.0.0.1:9991") -}}
{{- end }}
{{- if and (eq (include "sysdig.custom_ca.enabled" (dict "global" .Values.global.ssl "component" .Values.ssl)) "true") (.Values.sysdig.settings) (hasKey .Values.sysdig.settings "http_proxy") (hasKey (default dict .Values.sysdig.settings.http_proxy) "ssl") (eq (get (default (dict "ssl" false) .Values.sysdig.settings.http_proxy) "ssl") true) }}
{{- $baseSettings := .Values.sysdig.settings -}}
{{- $caFilePath := printf "%s%s" "/etc/ca-certs/" (include "sysdig.custom_ca.keyName" (dict "global" .Values.global.ssl "component" .Values.ssl)) }}
{{- $mergedSettings := mergeOverwrite $baseSettings (dict "http_proxy" (dict "ca_certificate" $caFilePath)) -}}
{{ toYaml $mergedSettings | nindent 4 }}
Expand Down
39 changes: 39 additions & 0 deletions charts/agent/tests/gke_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,45 @@ tests:
enabled: false
template: templates/configmap.yaml

- it: Ensure promscrape_web_address is set 127.0.0.1:9991 when autopilot is enabled
set:
gke:
autopilot: true
asserts:
- matchRegex:
path: data['dragent.yaml']
pattern: |-
promscrape_web_address: 127.0.0.1:9991
template: templates/configmap.yaml

- it: Ensure promscrape_web_address is unaltered when is set on settings and autopilot is enabled
set:
gke:
autopilot: true
sysdig:
settings:
promscrape_web_address: test:1234
asserts:
- matchRegex:
path: data['dragent.yaml']
pattern: |-
promscrape_web_address: test:1234
template: templates/configmap.yaml

- it: Ensure promscrape_web_address is unaltered when autopilot is disabled
set:
gke:
autopilot: false
sysdig:
settings:
promscrape_web_address: test:1234
asserts:
- matchRegex:
path: data['dragent.yaml']
pattern: |-
promscrape_web_address: test:1234
template: templates/configmap.yaml

- it: Ensure ephemeral storage is set correctly on kmod container when slim mode is enabled
set:
gke:
Expand Down
4 changes: 2 additions & 2 deletions charts/sysdig-deploy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: sysdig-deploy
description: A chart with various Sysdig components for Kubernetes
type: application
version: 1.39.0
version: 1.39.1
maintainers:
- name: AlbertoBarba
email: alberto.barba@sysdig.com
Expand All @@ -26,7 +26,7 @@ dependencies:
- name: agent
# repository: https://charts.sysdig.com
repository: file://../agent
version: ~1.20.1
version: ~1.20.2
alias: agent
condition: agent.enabled
- name: common
Expand Down