From dd9fddfcdedf9dffbe373d8d3ab7609771f6d9c6 Mon Sep 17 00:00:00 2001
From: undistrobot <undistro@getupcloud.com>
Date: Mon, 20 May 2024 15:30:50 +0000
Subject: [PATCH] update zora chart

---
 charts/zora/Chart.yaml                            |  4 ++--
 charts/zora/README.md                             |  4 ++--
 .../zora.undistro.io_vulnerabilityreports.yaml    | 12 ++++++++++++
 charts/zora/templates/operator/deployment.yaml    | 15 ++++++++++-----
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/charts/zora/Chart.yaml b/charts/zora/Chart.yaml
index 4bafe52..57a2cda 100644
--- a/charts/zora/Chart.yaml
+++ b/charts/zora/Chart.yaml
@@ -17,7 +17,7 @@ name: zora
 description: A multi-plugin solution that reports misconfigurations and vulnerabilities by scanning your cluster at scheduled times.
 icon: https://zora-docs.undistro.io/v0.7/assets/logo.svg
 type: application
-version: 0.8.5-rc3
-appVersion: "v0.8.5-rc3"
+version: 0.8.5-rc4
+appVersion: "v0.8.5-rc4"
 sources:
   - https://github.com/undistro/zora
diff --git a/charts/zora/README.md b/charts/zora/README.md
index a9d833c..c6be42b 100644
--- a/charts/zora/README.md
+++ b/charts/zora/README.md
@@ -1,6 +1,6 @@
 # Zora Helm Chart
 
-![Version: 0.8.5-rc3](https://img.shields.io/badge/Version-0.8.5--rc3-informational?style=flat-square&color=3CA9DD) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square&color=3CA9DD) ![AppVersion: v0.8.5-rc3](https://img.shields.io/badge/AppVersion-v0.8.5--rc3-informational?style=flat-square&color=3CA9DD)
+![Version: 0.8.5-rc4](https://img.shields.io/badge/Version-0.8.5--rc4-informational?style=flat-square&color=3CA9DD) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square&color=3CA9DD) ![AppVersion: v0.8.5-rc4](https://img.shields.io/badge/AppVersion-v0.8.5--rc4-informational?style=flat-square&color=3CA9DD)
 
 A multi-plugin solution that reports misconfigurations and vulnerabilities by scanning your cluster at scheduled times.
 
@@ -13,7 +13,7 @@ helm repo add undistro https://charts.undistro.io --force-update
 helm repo update undistro
 helm upgrade --install zora undistro/zora \
   -n zora-system \
-  --version 0.8.5-rc3 \
+  --version 0.8.5-rc4 \
   --create-namespace \
   --wait \
   --set clusterName="$(kubectl config current-context)"
diff --git a/charts/zora/crds/zora.undistro.io_vulnerabilityreports.yaml b/charts/zora/crds/zora.undistro.io_vulnerabilityreports.yaml
index 55b5d3e..e8670c3 100644
--- a/charts/zora/crds/zora.undistro.io_vulnerabilityreports.yaml
+++ b/charts/zora/crds/zora.undistro.io_vulnerabilityreports.yaml
@@ -371,8 +371,18 @@ spec:
                   items:
                     type: string
                   type: array
+                totalPackages:
+                  description: |-
+                    TotalPackages represents the total number of affected packages in this image.
+                    A package affected by two vulnerabilities is counted twice.
+                  type: integer
                 totalResources:
                   type: integer
+                totalUniquePackages:
+                  description: |-
+                    TotalUniquePackages represents the total number of unique affected packages in this image.
+                    A package affected by multiple vulnerabilities is counted only once.
+                  type: integer
                 vulnerabilities:
                   items:
                     properties:
@@ -425,7 +435,9 @@ spec:
                 - image
                 - resources
                 - summary
+                - totalPackages
                 - totalResources
+                - totalUniquePackages
                 - vulnerabilities
               type: object
             status:
diff --git a/charts/zora/templates/operator/deployment.yaml b/charts/zora/templates/operator/deployment.yaml
index 05ec122..57cc4b5 100644
--- a/charts/zora/templates/operator/deployment.yaml
+++ b/charts/zora/templates/operator/deployment.yaml
@@ -13,20 +13,25 @@
 # limitations under the License.
 {{ $secretName := printf "%s-serving-cert" (include "zora.fullname" .) -}}
 {{- $serviceName := printf "%s-webhook" (include "zora.fullname" .) -}}
-{{- if and .Values.operator.webhook.enabled (not (lookup "v1" "Secret" .Release.Namespace $secretName)) -}}
-  {{- $cn := $serviceName -}}
-  {{- $ca := genCA $cn 3650 -}}
-  {{- $altNames := list ( printf "%s.%s" $serviceName .Release.Namespace ) ( printf "%s.%s.svc" $serviceName .Release.Namespace ) ( printf "%s.%s.svc.cluster.local" $serviceName .Release.Namespace ) -}}
-  {{- $cert := genSignedCert $cn nil $altNames 3650 $ca -}}
+{{- if .Values.operator.webhook.enabled -}}
+{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace $secretName -}}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $secretName }}
 type: kubernetes.io/tls
 data:
+{{- if $existingSecret }}
+  {{- toYaml $existingSecret.data | nindent 2 }}
+{{- else }}
+  {{- $cn := $serviceName }}
+  {{- $ca := genCA $cn 3650 }}
+  {{- $altNames := list ( printf "%s.%s" $serviceName .Release.Namespace ) ( printf "%s.%s.svc" $serviceName .Release.Namespace ) ( printf "%s.%s.svc.cluster.local" $serviceName .Release.Namespace ) }}
+  {{- $cert := genSignedCert $cn nil $altNames 3650 $ca }}
   tls.key: {{ b64enc $cert.Key }}
   tls.crt: {{ b64enc $cert.Cert }}
   ca.crt: {{ b64enc $ca.Cert }}
+{{- end }}
 ---
 {{- end -}}
 apiVersion: apps/v1