Skip to content

fix(agent): allows to specify non semver tags [SMAGENT-6093] #1504

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 2 commits into from
Nov 30, 2023
Merged

fix(agent): allows to specify non semver tags [SMAGENT-6093] #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc327cb
fix(agent): allows to specify non semver tags
AlbertoBarba Nov 30, 2023
c2bf952
fix(agent): add tests to cover non semantic version tag provided
AlbertoBarba Nov 30, 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/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.17.1
version: 1.17.2
8 changes: 8 additions & 0 deletions charts/agent/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,3 +511,11 @@ true
{{- define "agent.localForwarderConfigMapName" }}
{{- include "agent.configmapName" . | trunc 46 | trimSuffix "-" | printf "%s-local-forwarder" }}
{{- end }}

{{- define "agent.enableHttpProbes" }}
{{- if regexMatch "^v?([0-9]+)(\\.[0-9]+)?(\\.[0-9]+)?(-([0-9A-Za-z\\-]+(\\.[0-9A-Za-z\\-]+)*))?(\\+([0-9A-Za-z\\-]+(\\.[0-9A-Za-z\\-]+)*))?$" .Values.image.tag }}
{{- if semverCompare ">= 12.18.0-0" .Values.image.tag }}
{{- printf "true" -}}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/agent/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ spec:
value: /opt/draios/etc/ca-certs/{{- include "sysdig.custom_ca.keyName" (dict "global" .Values.global.ssl "component" .Values.ssl) -}}
{{- end }}
readinessProbe:
{{- if ge (semver "12.18.0" | (semver .Values.image.tag).Compare) 0 }}
{{- if eq (include "agent.enableHttpProbes" .) "true" }}
httpGet:
path: /healthz
Copy link

@fuster92 fuster92 Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A totally unrelated comment, is the z at the end on purpose?

Copy link
Contributor Author

@AlbertoBarba AlbertoBarba Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's a sort of convention

port: 24483
Expand Down
2 changes: 1 addition & 1 deletion charts/agent/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ spec:
value: /opt/draios/etc/ca-certs/{{- include "sysdig.custom_ca.keyName" (dict "global" .Values.global.ssl "component" .Values.ssl) -}}
{{- end }}
readinessProbe:
{{- if ge (semver "12.18.0" | (semver .Values.image.tag).Compare) 0 }}
{{- if eq (include "agent.enableHttpProbes" .) "true" }}
httpGet:
path: /healthz
port: 24483
Expand Down
66 changes: 66 additions & 0 deletions charts/agent/tests/readiness_probe_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,38 @@ tests:
initialDelaySeconds: 90
periodSeconds: 3
template: templates/daemonset.yaml
- it: "[DaemonSet] Readiness Probe (agent == dev)"
set:
image:
tag: dev
asserts:
- equal:
path: spec.template.spec.containers[0].readinessProbe
value:
exec:
command:
- test
- -e
- /opt/draios/logs/running
initialDelaySeconds: 90
periodSeconds: 3
template: templates/daemonset.yaml
- it: "[DaemonSet] Readiness Probe (agent == latest)"
set:
image:
tag: latest
asserts:
- equal:
path: spec.template.spec.containers[0].readinessProbe
value:
exec:
command:
- test
- -e
- /opt/draios/logs/running
initialDelaySeconds: 90
periodSeconds: 3
template: templates/daemonset.yaml
- it: "[DelegatedAgentDeployment] Readiness Probe (agent > 12.18.0)"
set:
delegatedAgentDeployment:
Expand Down Expand Up @@ -94,6 +126,40 @@ tests:
- /opt/draios/logs/running
initialDelaySeconds: 90
periodSeconds: 3
- it: "[DelegatedAgentDeployment] Readiness Probe (agent == dev)"
set:
delegatedAgentDeployment:
enabled: true
image:
tag: dev
asserts:
- equal:
path: spec.template.spec.containers[0].readinessProbe
value:
exec:
command:
- test
- -e
- /opt/draios/logs/running
initialDelaySeconds: 90
periodSeconds: 3
- it: "[DelegatedAgentDeployment] Readiness Probe (agent == latest)"
set:
delegatedAgentDeployment:
enabled: true
image:
tag: latest
asserts:
- equal:
path: spec.template.spec.containers[0].readinessProbe
value:
exec:
command:
- test
- -e
- /opt/draios/logs/running
initialDelaySeconds: 90
periodSeconds: 3
- it: Test setting probe delays
set:
daemonset:
Expand Down