migrate chart changes from v2 to v3

Signed-off-by: Frank Jogeleit <frank.jogeleit@lovoo.com>
kyverno · Jun 8, 2024 · 7e621e9 · 7e621e9
1 parent e2fb0f1
commit 7e621e9
Show file tree

Hide file tree

Showing 13 changed files with 132 additions and 293 deletions.
diff --git a/charts/policy-reporter/charts/ui/values.yaml b/charts/policy-reporter/charts/ui/values.yaml
diff --git a/charts/policy-reporter/templates/monitoring/clusterpolicy-details.grafanadashboard.yaml b/charts/policy-reporter/templates/monitoring/clusterpolicy-details.grafanadashboard.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.monitoring.grafana.dashboards.enabled .Values.monitoring.grafana.dashboards.enable.clusterPolicyReportDetails .Values.monitoring.grafana.grafanaDashboard.enabled }}
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  labels:
+    {{ .Values.monitoring.grafana.dashboards.label }}: {{ .Values.monitoring.grafana.dashboards.value | quote }}
+    {{- include "monitoring.labels" . | nindent 4 }}
+  name: {{ include "monitoring.fullname" . }}-clusterpolicy-details-dashboard
+  namespace: {{ include "policyreporter.namespace" . }}
+spec:
+  allowCrossNamespaceImport: {{ .Values.monitoring.grafana.grafanaDashboard.allowCrossNamespaceImport }}
+  folder: {{ .Values.monitoring.grafana.grafanaDashboard.folder }}
+  instanceSelector:
+    matchLabels:
+      {{- toYaml .Values.monitoring.grafana.grafanaDashboard.matchLabels | nindent 6 }}
+  configMapRef:
+    name: {{ include "monitoring.fullname" . }}-clusterpolicy-details-dashboard
+    key: cluster-policy-reporter-details-dashboard.json
+{{- end }}
diff --git a/charts/policy-reporter/templates/monitoring/overview.grafanadashboard.yaml b/charts/policy-reporter/templates/monitoring/overview.grafanadashboard.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.monitoring.grafana.dashboards.enabled .Values.monitoring.grafana.dashboards.enable.overview .Values.monitoring.grafana.grafanaDashboard.enabled }}
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  labels:
+    {{ .Values.monitoring.grafana.dashboards.label }}: {{ .Values.monitoring.grafana.dashboards.value | quote }}
+    {{- include "monitoring.labels" . | nindent 4 }}
+  name: {{ include "monitoring.fullname" . }}-overview-dashboard
+  namespace: {{ include "policyreporter.namespace" . }}
+spec:
+  allowCrossNamespaceImport: {{ .Values.monitoring.grafana.grafanaDashboard.allowCrossNamespaceImport }}
+  folder: {{ .Values.monitoring.grafana.grafanaDashboard.folder }}
+  instanceSelector:
+    matchLabels:
+      {{- toYaml .Values.monitoring.grafana.grafanaDashboard.matchLabels | nindent 6 }}
+  configMapRef:
+    name: {{ include "monitoring.fullname" . }}-overview-dashboard
+    key: policy-reporter-dashboard.json
+{{- end }}
diff --git a/charts/policy-reporter/templates/monitoring/policy-details.grafanadashboard.yaml b/charts/policy-reporter/templates/monitoring/policy-details.grafanadashboard.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.monitoring.grafana.dashboards.enabled .Values.monitoring.grafana.dashboards.enable.policyReportDetails .Values.monitoring.grafana.grafanaDashboard.enabled }}
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  labels:
+    {{ .Values.monitoring.grafana.dashboards.label }}: {{ .Values.monitoring.grafana.dashboards.value | quote }}
+    {{- include "monitoring.labels" . | nindent 4 }}
+  name: {{ include "monitoring.fullname" . }}-policy-details-dashboard
+  namespace: {{ include "policyreporter.namespace" . }}
+spec:
+  allowCrossNamespaceImport: {{ .Values.monitoring.grafana.grafanaDashboard.allowCrossNamespaceImport }}
+  folder: {{ .Values.monitoring.grafana.grafanaDashboard.folder }}
+  instanceSelector:
+    matchLabels:
+      {{- toYaml .Values.monitoring.grafana.grafanaDashboard.matchLabels | nindent 6 }}
+  configMapRef:
+    name: {{ include "monitoring.fullname" . }}-policy-details-dashboard
+    key: policy-reporter-details-dashboard.json
+{{- end }}
diff --git a/charts/policy-reporter/templates/ui/deployment.yaml b/charts/policy-reporter/templates/ui/deployment.yaml
@@ -80,6 +80,16 @@ spec:
           {{- with .Values.ui.envVars }}
           {{- . | toYaml | trim | nindent 10 }}
           {{- end }}
+      {{- if .Values.sidecarContainers }}
+        {{- range $name, $spec :=  .Values.sidecarContainers }}
+        - name: {{ $name }}
+          {{- if kindIs "string" $spec }}
+            {{- tpl $spec $ | nindent 10 }}
+          {{- else }}
+            {{- toYaml $spec | nindent 10 }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
       volumes:
       - name: config-file
         secret:

diff --git a/charts/policy-reporter/templates/ui/extra-manifests.yaml b/charts/policy-reporter/templates/ui/extra-manifests.yaml
@@ -0,0 +1,6 @@
+{{- if .Values.ui.enabled -}}
+{{ range .Values.ui.extraManifests }}
+---
+{{ tpl . $ }}
+{{ end }}
+{{- end }}
diff --git a/charts/policy-reporter/templates/ui/ingress.yaml b/charts/policy-reporter/templates/ui/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ui.enabled -}}
 {{- if .Values.ui.ingress.enabled -}}
 {{- $fullName := include "ui.fullname" . -}}
-{{- $svcPort := .Values.ui.service.port -}}
+{{- $svcPort := .Values.ui.ingress.port | default .Values.ui.service.port -}}
 {{- if and .Values.ui.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ui.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ui.ingress.annotations "kubernetes.io/ingress.class" .Values.ui.ingress.className}}

diff --git a/charts/policy-reporter/templates/ui/service.yaml b/charts/policy-reporter/templates/ui/service.yaml
@@ -20,6 +20,9 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+  {{- if .Values.ui.service.additionalPorts }}
+    {{ toYaml .Values.ui.service.additionalPorts | indent 4 }}
+  {{- end }}
   selector:
     {{- include "ui.selectorLabels" . | nindent 4 }}
 {{- end }}