Pulling dev branch into master - Automated PR by CICD (#104)

* Adding hooks to kollector (#102) * Adding hooks to kollector Signed-off-by: David Wertenteil <[email protected]> * Load host scan path from env variables Signed-off-by: David Wertenteil <[email protected]> --------- Signed-off-by: David Wertenteil <[email protected]> * Update "Install Helm" action version * Automated commit - update kubevuln image tag with: v0.1.19 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Automated commit - update kollector image tag with: v0.1.10 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * update ks image tag and requested memory (#105) Signed-off-by: David Wertenteil <[email protected]> --------- Signed-off-by: David Wertenteil <[email protected]> Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: matanshk <[email protected]> Co-authored-by: dwertent <[email protected]>
kubescape · Mar 7, 2023 · 4e08229 · 4e08229
1 parent 5f6cc8c
commit 4e08229
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/charts/kubescape-cloud-operator/Chart.yaml b/charts/kubescape-cloud-operator/Chart.yaml
@@ -9,14 +9,14 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.10.0
+version: 1.10.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 
-appVersion: 1.10.0
+appVersion: 1.10.2
 
 maintainers:
 - name: Ben Hirschberg

diff --git a/charts/kubescape-cloud-operator/templates/kollector/statefulset.yaml b/charts/kubescape-cloud-operator/templates/kollector/statefulset.yaml
@@ -13,6 +13,10 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app: {{ .Values.kollector.name }}
     tier: {{ .Values.global.namespaceTier}}
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade # hook should apply when installing and upgrading
+    helm.sh/hook-weight: "-1" # run before all other hooks
+    helm.sh/hook-delete-policy: before-hook-creation #,hook-succeeded
 spec:
   serviceName: ""
   replicas: {{ .Values.kollector.replicaCount }}

diff --git a/charts/kubescape-cloud-operator/templates/kubescape/deployment.yaml b/charts/kubescape-cloud-operator/templates/kubescape/deployment.yaml
@@ -88,6 +88,8 @@ spec:
           value: "{{ .Values.kubescape.submit }}"
         - name: KS_SKIP_UPDATE_CHECK
           value: "{{ .Values.kubescape.skipUpdateCheck }}"
+        - name: KS_HOST_SCAN_YAML
+          value: "/home/ks/.kubescape/host-scanner.yaml"
         - name: KS_SAAS_ENV
         {{ if eq .Values.environment "dev" }}
           value: "dev"
@@ -103,8 +105,6 @@ spec:
           value: "{{ .Values.cloudProviderMetadata.cloudRegion }}"
         - name: KS_KUBE_CLUSTER
           value: "{{ .Values.clusterName }}"
-        - name: KS_HOST_SCAN_YAML
-          value: "/home/ks/.kubescape/host-scanner.yaml"
         {{- if eq "gke" $cloud_provider }}
         - name: KS_GKE_PROJECT
           value: "{{ .Values.cloudProviderMetadata.gkeProject }}"

diff --git a/charts/kubescape-cloud-operator/values.yaml b/charts/kubescape-cloud-operator/values.yaml
@@ -124,13 +124,13 @@ kubescape:
   image:
     # -- source code: https://github.com/kubescape/kubescape/tree/master/httphandler (public repo)
     repository: quay.io/kubescape/kubescape
-    tag: v2.2.3
+    tag: v2.2.4
     pullPolicy: Always
 
   resources:
     requests:
        cpu: 250m
-       memory: 300Mi
+       memory: 400Mi
     limits:
        cpu: 600m
        memory: 800Mi
@@ -254,7 +254,7 @@ kubevuln:
   image:
     # -- source code: https://github.com/kubescape/kubevuln
     repository: quay.io/kubescape/kubevuln
-    tag: v0.1.14
+    tag: v0.1.19
     pullPolicy: Always
 
   replicaCount: 1
@@ -301,7 +301,7 @@ kollector:
   image:
     # -- source code: https://github.com/kubescape/kollector
     repository: quay.io/kubescape/kollector
-    tag: v0.1.9
+    tag: v0.1.10
     pullPolicy: Always
 
   replicaCount: 1

diff --git a/charts/kubescape-prometheus-integrator/values.yaml b/charts/kubescape-prometheus-integrator/values.yaml
@@ -46,7 +46,7 @@ kubescape:
   image:
     # -- source code: https://github.com/kubescape/kubescape/tree/master/httphandler (public repo)
     repository: quay.io/kubescape/kubescape
-    tag: v2.1.3
+    tag: v2.2.4
     pullPolicy: IfNotPresent
 
   resources: