Merge pull request #498 from kubescape/bump

prepare next release
kubescape · Sep 5, 2024 · 4c3c49d · 4c3c49d
2 parents 1e4a3d6 + 5ea839f
commit 4c3c49d
Show file tree

Hide file tree

Showing 6 changed files with 871 additions and 872 deletions.
diff --git a/charts/kubescape-operator/Chart.yaml b/charts/kubescape-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.21.1
+version: 1.21.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.21.1
+appVersion: 1.21.2
 
 maintainers:
 - name: Ben Hirschberg

diff --git a/charts/kubescape-operator/templates/hooks/hook-delete-before-upgrade.yaml b/charts/kubescape-operator/templates/hooks/hook-delete-before-upgrade.yaml
@@ -70,8 +70,8 @@ spec:
       serviceAccountName: {{ $hookName }}
       containers:
         - name: {{ $hookName }}
-          image: "docker.io/bitnami/kubectl:1.30.3"
-          imagePullPolicy: "IfNotPresent"
+          image: "{{ .Values.serviceDiscovery.configMapUpdate.image.repository }}:{{ .Values.serviceDiscovery.configMapUpdate.image.tag }}"
+          imagePullPolicy: {{ .Values.serviceDiscovery.configMapUpdate.image.pullPolicy }}
           command:
             - /bin/sh
             - -e
@@ -84,6 +84,7 @@ spec:
               kubectl -n {{ .Values.ksNamespace }} delete deployment kubevuln --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment operator --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment otel-collector --ignore-not-found=true;
+              kubectl -n {{ .Values.ksNamespace }} delete deployment prometheus-exporter --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment storage --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete deployment synchronizer --ignore-not-found=true;
               kubectl -n {{ .Values.ksNamespace }} delete statefulset kollector --ignore-not-found=true;

diff --git a/charts/kubescape-operator/templates/proxy-support/_noproxy_list.tpl b/charts/kubescape-operator/templates/proxy-support/_noproxy_list.tpl
@@ -2,7 +2,10 @@
     {{ $api_server_ip := "127.0.0.1" }}
     {{- $api_server_service := (lookup "v1" "Service" "default" "kubernetes") -}}
     {{- if $api_server_service -}}
-      {{ $api_server_ip = $api_server_service.spec.clusterIP }}        
+      {{ $api_server_ip = $api_server_service.spec.clusterIP }}
     {{- end -}}
     {{ .Values.gateway.name }},{{ .Values.kubescape.name }},{{ .Values.kubevuln.name }},{{ .Values.nodeAgent.name }},{{ .Values.operator.name }},otel-collector,kubernetes.default.svc.*,{{ $api_server_ip }}
+    {{- if ne .Values.global.noProxy "" -}}
+        ,{{- .Values.global.noProxy -}}
+    {{- end -}}
 {{- end -}}