Merge pull request #154 from kyverno/chart-update

Custom Target names and UI update
kyverno · Jun 9, 2022 · 8741ec9 · 8741ec9
2 parents 6a64d10 + d3cebe5
commit 8741ec9
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+# 2.9.1
+* Policy Reporter
+    * Name Configuration for Target (Channels) to customize UI Labels
+* Policy Reporter UI
+    * Fix table on chip selection
+    * Order labels
+    * Return 404 Status Code for non existing URL paths
+
 # 2.9.0
 * Policy Reporter
     * New configuration to use Redis as external result caching store

diff --git a/charts/policy-reporter/Chart.lock b/charts/policy-reporter/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 2.3.0
 - name: ui
   repository: ""
-  version: 2.4.0
+  version: 2.4.2
 - name: kyvernoPlugin
   repository: ""
   version: 1.3.1
-digest: sha256:7a734be2c2f509c2e8424949509f176278a279d75600f89ec81c0b41ac27041f
-generated: "2022-05-23T16:49:26.121035+02:00"
+digest: sha256:f1686cfbc5de749d82c2020a8c546e70534e4d7cd154d74cf1380a5fc3dc91ee
+generated: "2022-06-09T23:43:09.479977+02:00"
diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml
@@ -5,8 +5,8 @@ description: |
   It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
 
 type: application
-version: 2.9.0
-appVersion: 2.6.0
+version: 2.9.1
+appVersion: 2.6.1
 
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
 home: https://kyverno.github.io/policy-reporter
@@ -21,7 +21,7 @@ dependencies:
     version: "2.3.0"
   - name: ui
     condition: ui.enabled
-    version: "2.4.0"
+    version: "2.4.2"
   - name: kyvernoPlugin
     condition: kyvernoPlugin.enabled
     version: "1.3.1"
diff --git a/charts/policy-reporter/charts/ui/Chart.yaml b/charts/policy-reporter/charts/ui/Chart.yaml
@@ -3,5 +3,5 @@ name: ui
 description: Policy Reporter UI
 
 type: application
-version: 2.4.0
-appVersion: 1.4.0
+version: 2.4.2
+appVersion: 1.4.2
diff --git a/charts/policy-reporter/charts/ui/values.yaml b/charts/policy-reporter/charts/ui/values.yaml
@@ -29,7 +29,7 @@ image:
   registry: ghcr.io
   repository: kyverno/policy-reporter-ui
   pullPolicy: IfNotPresent
-  tag: 1.4.0
+  tag: 1.4.2
 
 # configurations related to the PolicyReporter API
 policyReporter:

diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml
@@ -2,7 +2,7 @@ image:
   registry: ghcr.io
   repository: kyverno/policy-reporter
   pullPolicy: IfNotPresent
-  tag: 2.6.0
+  tag: 2.6.1
 
 imagePullSecrets: []
 

diff --git a/manifest/default-policy-reporter-ui/install.yaml b/manifest/default-policy-reporter-ui/install.yaml
@@ -93,7 +93,7 @@ spec:
       automountServiceAccountToken: false
       containers:
         - name: ui
-          image: "ghcr.io/kyverno/policy-reporter-ui:1.4.0"
+          image: "ghcr.io/kyverno/policy-reporter-ui:1.4.2"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -145,7 +145,7 @@ spec:
         fsGroup: 1234
       containers:
         - name: policy-reporter
-          image: "ghcr.io/kyverno/policy-reporter:2.6.0"
+          image: "ghcr.io/kyverno/policy-reporter:2.6.1"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/manifest/kyverno-policy-reporter-ui/install.yaml b/manifest/kyverno-policy-reporter-ui/install.yaml
@@ -204,7 +204,7 @@ spec:
     spec:
       containers:
         - name: ui
-          image: "ghcr.io/kyverno/policy-reporter-ui:1.4.0"
+          image: "ghcr.io/kyverno/policy-reporter-ui:1.4.2"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -256,7 +256,7 @@ spec:
         fsGroup: 1234
       containers:
         - name: policy-reporter
-          image: "ghcr.io/kyverno/policy-reporter:2.6.0"
+          image: "ghcr.io/kyverno/policy-reporter:2.6.1"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/manifest/policy-reporter/install.yaml b/manifest/policy-reporter/install.yaml
@@ -84,7 +84,7 @@ spec:
       automountServiceAccountToken: true
       containers:
         - name: policy-reporter
-          image: "ghcr.io/kyverno/policy-reporter:2.6.0"
+          image: "ghcr.io/kyverno/policy-reporter:2.6.1"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -21,6 +21,7 @@ type MetricsFilter struct {
 
 // Loki configuration
 type Loki struct {
+	Name            string            `mapstructure:"name"`
 	Host            string            `mapstructure:"host"`
 	CustomLabels    map[string]string `mapstructure:"customLabels"`
 	SkipExisting    bool              `mapstructure:"skipExistingOnStartup"`
@@ -32,6 +33,7 @@ type Loki struct {
 
 // Elasticsearch configuration
 type Elasticsearch struct {
+	Name            string          `mapstructure:"name"`
 	Host            string          `mapstructure:"host"`
 	Index           string          `mapstructure:"index"`
 	Rotation        string          `mapstructure:"rotation"`
@@ -44,6 +46,7 @@ type Elasticsearch struct {
 
 // Slack configuration
 type Slack struct {
+	Name            string       `mapstructure:"name"`
 	Webhook         string       `mapstructure:"webhook"`
 	SkipExisting    bool         `mapstructure:"skipExistingOnStartup"`
 	MinimumPriority string       `mapstructure:"minimumPriority"`
@@ -54,6 +57,7 @@ type Slack struct {
 
 // Discord configuration
 type Discord struct {
+	Name            string       `mapstructure:"name"`
 	Webhook         string       `mapstructure:"webhook"`
 	SkipExisting    bool         `mapstructure:"skipExistingOnStartup"`
 	MinimumPriority string       `mapstructure:"minimumPriority"`
@@ -64,6 +68,7 @@ type Discord struct {
 
 // Teams configuration
 type Teams struct {
+	Name            string       `mapstructure:"name"`
 	Webhook         string       `mapstructure:"webhook"`
 	SkipExisting    bool         `mapstructure:"skipExistingOnStartup"`
 	MinimumPriority string       `mapstructure:"minimumPriority"`
@@ -82,6 +87,7 @@ type UI struct {
 
 // Webhook configuration
 type Webhook struct {
+	Name            string            `mapstructure:"name"`
 	Host            string            `mapstructure:"host"`
 	Headers         map[string]string `mapstructure:"headers"`
 	SkipExisting    bool              `mapstructure:"skipExistingOnStartup"`
@@ -92,6 +98,7 @@ type Webhook struct {
 }
 
 type S3 struct {
+	Name            string       `mapstructure:"name"`
 	AccessKeyID     string       `mapstructure:"accessKeyID"`
 	SecretAccessKey string       `mapstructure:"secretAccessKey"`
 	Region          string       `mapstructure:"region"`