diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml index 9234445bf..a9d95ed04 100644 --- a/charts/agent/Chart.yaml +++ b/charts/agent/Chart.yaml @@ -30,4 +30,4 @@ sources: - https://app.sysdigcloud.com/#/settings/user - https://github.com/draios/sysdig type: application -version: 1.31.0 +version: 1.32.0 diff --git a/charts/agent/templates/_helpers.tpl b/charts/agent/templates/_helpers.tpl index 4409f4bb4..ebbe82984 100644 --- a/charts/agent/templates/_helpers.tpl +++ b/charts/agent/templates/_helpers.tpl @@ -605,6 +605,14 @@ true {{- end }} {{- end }} +{{- define "agent.enableWindowsProbesSinglePort" }} + {{- if and (include "agent.isSemVer" .Values.windows.image.tag) (semverCompare "< 1.3.0-0" .Values.windows.image.tag) }} + {{- printf "false" -}} + {{- else -}} + {{- printf "true" -}} + {{- end }} +{{- end }} + {{- define "agent.enableFalcoBaselineSecureLight" }} {{- if and (include "agent.isSemVer" .Values.image.tag) (semverCompare ">= 12.19.0-0" .Values.image.tag) }} {{- printf "true" -}} diff --git a/charts/agent/templates/daemonset-windows.yaml b/charts/agent/templates/daemonset-windows.yaml index c3bb26f18..2022217d7 100644 --- a/charts/agent/templates/daemonset-windows.yaml +++ b/charts/agent/templates/daemonset-windows.yaml @@ -42,7 +42,7 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 24484 + port: {{ if eq (include "agent.enableWindowsProbesSinglePort" .) "true" }}24483{{ else }}24484{{ end }} initialDelaySeconds: 60 periodSeconds: 30 timeoutSeconds: 10 @@ -50,7 +50,7 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 24484 + port: {{ if eq (include "agent.enableWindowsProbesSinglePort" .) "true" }}24483{{ else }}24484{{ end }} initialDelaySeconds: 60 timeoutSeconds: 10 resources: diff --git a/charts/agent/tests/readiness_probe_windows_test.yaml b/charts/agent/tests/readiness_probe_windows_test.yaml new file mode 100644 index 000000000..0c8af5675 --- /dev/null +++ b/charts/agent/tests/readiness_probe_windows_test.yaml @@ -0,0 +1,61 @@ +suite: Test the Readiness Probe Configuration +templates: + - templates/daemonset-windows.yaml +kubernetesProvider: + scheme: + "v1/Node": + gvr: + version: "v1" + resource: "nodes" + namespaced: false + objects: + - apiVersion: v1 + kind: Node + metadata: + name: fakenode + status: + nodeInfo: + osImage: fake-os-image +tests: + + - it: "Windows Agent Probes (agent < 1.3.0)" + set: + windows: + enabled: true + image: + tag: 1.2.5 + asserts: + - equal: + path: spec.template.spec.containers[*].livenessProbe.httpGet.port + value: 24484 + - equal: + path: spec.template.spec.containers[0].readinessProbe.httpGet.port + value: 24484 + + - it: "Windows Agent Probes (agent > 1.2.0)" + set: + windows: + enabled: true + image: + tag: 1.3.0 + asserts: + - equal: + path: spec.template.spec.containers[0].livenessProbe.httpGet.port + value: 24483 + - equal: + path: spec.template.spec.containers[0].readinessProbe.httpGet.port + value: 24483 + + - it: "Windows Agent Probes (agent = latest)" + set: + windows: + enabled: true + image: + tag: latest + asserts: + - equal: + path: spec.template.spec.containers[0].livenessProbe.httpGet.port + value: 24483 + - equal: + path: spec.template.spec.containers[0].readinessProbe.httpGet.port + value: 24483 diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml index 2e50fcd49..cc65958b8 100644 --- a/charts/agent/values.yaml +++ b/charts/agent/values.yaml @@ -68,7 +68,7 @@ windows: image: registry: quay.io repository: sysdig/agent-windows - tag: 1.2.0 + tag: 1.3.0 # Specify an imagePullPolicy # Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' # ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml index dafb30ece..48c14c500 100644 --- a/charts/sysdig-deploy/Chart.yaml +++ b/charts/sysdig-deploy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sysdig-deploy description: A chart with various Sysdig components for Kubernetes type: application -version: 1.68.1 +version: 1.69.0 maintainers: - name: AlbertoBarba email: alberto.barba@sysdig.com @@ -26,7 +26,7 @@ dependencies: - name: agent # repository: https://charts.sysdig.com repository: file://../agent - version: ~1.31.0 + version: ~1.32.0 alias: agent condition: agent.enabled - name: common