Added livenessProbe configuration spec

aquasecurity · Jun 18, 2024 · e37086a · e37086a
1 parent eaca434
commit e37086a
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ This repository includes the following charts; they can be deployed separately:
 |-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------|
 | [Server](server/)                   | Deploys the Console, Database, and Gateway components; optionally deploys Envoy component                                                                     | 2022.4.24            |
 | [Enforcer](enforcer/)               | Deploys the Aqua Enforcer daemonset                                                                                                                           | 2022.4.21            |
-| [Scanner](scanner/)                 | Deploys the Aqua Scanner deployment                                                                                                                           | 2022.4.7             |
+| [Scanner](scanner/)                 | Deploys the Aqua Scanner deployment                                                                                                                           | 2022.4.8             |
 | [KubeEnforcer](kube-enforcer/)      | Deploys Aqua KubeEnforcer                                                                                                                                     | 2022.4.46            |
 | [Gateway](gateway)                  | Deploys the Aqua Standalone Gateway                                                                                                                           | 2022.4.14            |
 | [Tenant-Manager](tenant-manager/)   | Deploys the Aqua Tenant Manager                                                                                                                               | 2022.4.0             |
@@ -83,7 +83,7 @@ aqua-helm/cyber-center          2022.4.5        2022.4          A Helm chart for
 aqua-helm/enforcer              2022.4.21       2022.4          A Helm chart for the Aqua Enforcer
 aqua-helm/kube-enforcer         2022.4.46       2022.4          A Helm chart for the Aqua KubeEnforcer Starboard
 aqua-helm/gateway               2022.4.14       2022.4          A Helm chart for the Aqua Gateway
-aqua-helm/scanner               2022.4.7        2022.4          A Helm chart for the Aqua Scanner CLI component
+aqua-helm/scanner               2022.4.8        2022.4          A Helm chart for the Aqua Scanner CLI component
 aqua-helm/server                2022.4.24       2022.4          A Helm chart for the Aqua Console components
 aqua-helm/tenant-manager        2022.4.1        2022.4          A Helm chart for the Aqua Tenant Manager
 ```

diff --git a/scanner/CHANGELOG.md b/scanner/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2022.4.8 (June 18th, 2024)
+* Added Liveness probe Configuration spec
+* 
 All notable changes to this project will be documented in this file.
 ## 2022.4.6 (Sep 28th, 2023)
 * Add RBAC configuration - SLK-72111

diff --git a/scanner/Chart.yaml b/scanner/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "2022.4"
 description: A Helm chart for the Aqua Scanner CLI component
 name: scanner
-version: "2022.4.7"
+version: "2022.4.8"
 icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
 home: https://www.aquasec.com/
 maintainers:

diff --git a/scanner/README.md b/scanner/README.md
diff --git a/scanner/templates/scanner-configmap.yaml b/scanner/templates/scanner-configmap.yaml
@@ -9,7 +9,11 @@ metadata:
     aqua.component: scanner
 {{ include "aqua.labels" . | indent 4 }}
 data:
-  SCALOCK_LOG_LEVEL: {{ .Values.logLevel | default "INFO" }}  
+  SCALOCK_LOG_LEVEL: {{ .Values.logLevel | default "INFO" }}
+  {{- if .Values.enableLivenessProbe }}
+  AQUA_HEALTH_MONITOR_ENABLED: "true"
+  AQUA_HEALTH_MONITOR_PORT: "8081"
+  {{- end }}
   {{- if .Values.cyberCenter.mtls.enabled }}
   AQUA_PRIVATE_KEY: "/opt/aquasec/ssl/key.pem"
   AQUA_PUBLIC_KEY: "/opt/aquasec/ssl/cert.pem"

diff --git a/scanner/templates/scanner-deployment.yaml b/scanner/templates/scanner-deployment.yaml
@@ -151,10 +151,12 @@ spec:
         ports:
         - containerPort: 8080
           protocol: TCP
+{{- if .Values.enableLivenessProbe }}
 {{- with .Values.livenessProbe }}
         livenessProbe:
 {{ toYaml . | indent 10 }}
 {{- end }}
+{{- end }}
 {{- with .Values.readinessProbe }}
         readinessProbe:
 {{ toYaml . | indent 10 }}

diff --git a/scanner/values.yaml b/scanner/values.yaml
@@ -117,7 +117,18 @@ scannerUserSecret:
   passwordKey: "" # secret key of the scanner password
 
 replicaCount: 1
-livenessProbe: {}
+# set this value to true for enabiling the livenessProbe
+enableLivenessProbe: false
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: 8081
+    scheme: HTTP
+  initial_delay_seconds: 15
+  period_seconds: 60
+  success_threshold: 1
+  failure_threshold: 3
+  timeout_seconds: 1
 readinessProbe: {}
 resources: {}
   # Note: For recommendations please check the official sizing guide.