From 339ecd3ba01b97459fd8a790ba4026a2167679bd Mon Sep 17 00:00:00 2001 From: Vishal Choudhary Date: Sun, 7 Jul 2024 20:42:08 +0530 Subject: [PATCH 1/4] fix: simplify watch Signed-off-by: Vishal Choudhary --- pkg/api/cephr.go | 47 ++++++++++++++++++++++++----------------------- pkg/api/cpolr.go | 47 ++++++++++++++++++++++++----------------------- pkg/api/ephr.go | 47 ++++++++++++++++++++++++----------------------- pkg/api/polr.go | 47 ++++++++++++++++++++++++----------------------- 4 files changed, 96 insertions(+), 92 deletions(-) diff --git a/pkg/api/cephr.go b/pkg/api/cephr.go index 248cb77..64fd839 100644 --- a/pkg/api/cephr.go +++ b/pkg/api/cephr.go @@ -274,29 +274,30 @@ func (c *cephrStore) DeleteCollection(ctx context.Context, deleteValidation rest func (c *cephrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching cluster ephemeral reports rv=%s", options.ResourceVersion) - switch options.ResourceVersion { - case "", "0": - return c.broadcaster.Watch() - default: - break - } - items, err := c.List(ctx, options) - if err != nil { - return nil, err - } - list, ok := items.(*reportsv1.ClusterEphemeralReportList) - if !ok { - return nil, fmt.Errorf("failed to convert runtime object into cluster ephemeral report list") - } - events := make([]watch.Event, len(list.Items)) - for i, pol := range list.Items { - report := pol.DeepCopy() - events[i] = watch.Event{ - Type: watch.Added, - Object: report, - } - } - return c.broadcaster.WatchWithPrefix(events) + return c.broadcaster.Watch() + // switch options.ResourceVersion { + // case "", "0": + // return c.broadcaster.Watch() + // default: + // break + // } + // items, err := c.List(ctx, options) + // if err != nil { + // return nil, err + // } + // list, ok := items.(*reportsv1.ClusterEphemeralReportList) + // if !ok { + // return nil, fmt.Errorf("failed to convert runtime object into cluster ephemeral report list") + // } + // events := make([]watch.Event, len(list.Items)) + // for i, pol := range list.Items { + // report := pol.DeepCopy() + // events[i] = watch.Event{ + // Type: watch.Added, + // Object: report, + // } + // } + // return c.broadcaster.WatchWithPrefix(events) } func (c *cephrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { diff --git a/pkg/api/cpolr.go b/pkg/api/cpolr.go index ad3ff02..624fac7 100644 --- a/pkg/api/cpolr.go +++ b/pkg/api/cpolr.go @@ -273,29 +273,30 @@ func (c *cpolrStore) DeleteCollection(ctx context.Context, deleteValidation rest func (c *cpolrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching cluster policy reports rv=%s", options.ResourceVersion) - switch options.ResourceVersion { - case "", "0": - return c.broadcaster.Watch() - default: - break - } - items, err := c.List(ctx, options) - if err != nil { - return nil, err - } - list, ok := items.(*v1alpha2.ClusterPolicyReportList) - if !ok { - return nil, fmt.Errorf("failed to convert runtime object into cluster policy report list") - } - events := make([]watch.Event, len(list.Items)) - for i, pol := range list.Items { - report := pol.DeepCopy() - events[i] = watch.Event{ - Type: watch.Added, - Object: report, - } - } - return c.broadcaster.WatchWithPrefix(events) + return c.broadcaster.Watch() + // switch options.ResourceVersion { + // case "", "0": + // return c.broadcaster.Watch() + // default: + // break + // } + // items, err := c.List(ctx, options) + // if err != nil { + // return nil, err + // } + // list, ok := items.(*v1alpha2.ClusterPolicyReportList) + // if !ok { + // return nil, fmt.Errorf("failed to convert runtime object into cluster policy report list") + // } + // events := make([]watch.Event, len(list.Items)) + // for i, pol := range list.Items { + // report := pol.DeepCopy() + // events[i] = watch.Event{ + // Type: watch.Added, + // Object: report, + // } + // } + // return c.broadcaster.WatchWithPrefix(events) } func (c *cpolrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { diff --git a/pkg/api/ephr.go b/pkg/api/ephr.go index d71fced..8e84d05 100644 --- a/pkg/api/ephr.go +++ b/pkg/api/ephr.go @@ -294,29 +294,30 @@ func (p *ephrStore) DeleteCollection(ctx context.Context, deleteValidation rest. func (p *ephrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching ephemeral reports rv=%s", options.ResourceVersion) - switch options.ResourceVersion { - case "", "0": - return p.broadcaster.Watch() - default: - break - } - items, err := p.List(ctx, options) - if err != nil { - return nil, err - } - list, ok := items.(*reportsv1.EphemeralReportList) - if !ok { - return nil, fmt.Errorf("failed to convert runtime object into ephemeral report list") - } - events := make([]watch.Event, len(list.Items)) - for i, pol := range list.Items { - report := pol.DeepCopy() - events[i] = watch.Event{ - Type: watch.Added, - Object: report, - } - } - return p.broadcaster.WatchWithPrefix(events) + return p.broadcaster.Watch() + // switch options.ResourceVersion { + // case "", "0": + // return p.broadcaster.Watch() + // default: + // break + // } + // items, err := p.List(ctx, options) + // if err != nil { + // return nil, err + // } + // list, ok := items.(*reportsv1.EphemeralReportList) + // if !ok { + // return nil, fmt.Errorf("failed to convert runtime object into ephemeral report list") + // } + // events := make([]watch.Event, len(list.Items)) + // for i, pol := range list.Items { + // report := pol.DeepCopy() + // events[i] = watch.Event{ + // Type: watch.Added, + // Object: report, + // } + // } + // return p.broadcaster.WatchWithPrefix(events) } func (p *ephrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { diff --git a/pkg/api/polr.go b/pkg/api/polr.go index 717fec5..21f78d9 100644 --- a/pkg/api/polr.go +++ b/pkg/api/polr.go @@ -294,29 +294,30 @@ func (p *polrStore) DeleteCollection(ctx context.Context, deleteValidation rest. func (p *polrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching policy reports rv=%s", options.ResourceVersion) - switch options.ResourceVersion { - case "", "0": - return p.broadcaster.Watch() - default: - break - } - items, err := p.List(ctx, options) - if err != nil { - return nil, err - } - list, ok := items.(*v1alpha2.PolicyReportList) - if !ok { - return nil, fmt.Errorf("failed to convert runtime object into policy report list") - } - events := make([]watch.Event, len(list.Items)) - for i, pol := range list.Items { - report := pol.DeepCopy() - events[i] = watch.Event{ - Type: watch.Added, - Object: report, - } - } - return p.broadcaster.WatchWithPrefix(events) + return p.broadcaster.Watch() + // switch options.ResourceVersion { + // case "", "0": + // return p.broadcaster.Watch() + // default: + // break + // } + // items, err := p.List(ctx, options) + // if err != nil { + // return nil, err + // } + // list, ok := items.(*v1alpha2.PolicyReportList) + // if !ok { + // return nil, fmt.Errorf("failed to convert runtime object into policy report list") + // } + // events := make([]watch.Event, len(list.Items)) + // for i, pol := range list.Items { + // report := pol.DeepCopy() + // events[i] = watch.Event{ + // Type: watch.Added, + // Object: report, + // } + // } + // return p.broadcaster.WatchWithPrefix(events) } func (p *polrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { From ca35f64be9d3f4e694fc8ba194ff1992d4d33f78 Mon Sep 17 00:00:00 2001 From: Vishal Choudhary Date: Sun, 7 Jul 2024 21:07:10 +0530 Subject: [PATCH 2/4] Revert "fix: simplify watch" This reverts commit 339ecd3ba01b97459fd8a790ba4026a2167679bd. --- pkg/api/cephr.go | 47 +++++++++++++++++++++++------------------------ pkg/api/cpolr.go | 47 +++++++++++++++++++++++------------------------ pkg/api/ephr.go | 47 +++++++++++++++++++++++------------------------ pkg/api/polr.go | 47 +++++++++++++++++++++++------------------------ 4 files changed, 92 insertions(+), 96 deletions(-) diff --git a/pkg/api/cephr.go b/pkg/api/cephr.go index 64fd839..248cb77 100644 --- a/pkg/api/cephr.go +++ b/pkg/api/cephr.go @@ -274,30 +274,29 @@ func (c *cephrStore) DeleteCollection(ctx context.Context, deleteValidation rest func (c *cephrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching cluster ephemeral reports rv=%s", options.ResourceVersion) - return c.broadcaster.Watch() - // switch options.ResourceVersion { - // case "", "0": - // return c.broadcaster.Watch() - // default: - // break - // } - // items, err := c.List(ctx, options) - // if err != nil { - // return nil, err - // } - // list, ok := items.(*reportsv1.ClusterEphemeralReportList) - // if !ok { - // return nil, fmt.Errorf("failed to convert runtime object into cluster ephemeral report list") - // } - // events := make([]watch.Event, len(list.Items)) - // for i, pol := range list.Items { - // report := pol.DeepCopy() - // events[i] = watch.Event{ - // Type: watch.Added, - // Object: report, - // } - // } - // return c.broadcaster.WatchWithPrefix(events) + switch options.ResourceVersion { + case "", "0": + return c.broadcaster.Watch() + default: + break + } + items, err := c.List(ctx, options) + if err != nil { + return nil, err + } + list, ok := items.(*reportsv1.ClusterEphemeralReportList) + if !ok { + return nil, fmt.Errorf("failed to convert runtime object into cluster ephemeral report list") + } + events := make([]watch.Event, len(list.Items)) + for i, pol := range list.Items { + report := pol.DeepCopy() + events[i] = watch.Event{ + Type: watch.Added, + Object: report, + } + } + return c.broadcaster.WatchWithPrefix(events) } func (c *cephrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { diff --git a/pkg/api/cpolr.go b/pkg/api/cpolr.go index 624fac7..ad3ff02 100644 --- a/pkg/api/cpolr.go +++ b/pkg/api/cpolr.go @@ -273,30 +273,29 @@ func (c *cpolrStore) DeleteCollection(ctx context.Context, deleteValidation rest func (c *cpolrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching cluster policy reports rv=%s", options.ResourceVersion) - return c.broadcaster.Watch() - // switch options.ResourceVersion { - // case "", "0": - // return c.broadcaster.Watch() - // default: - // break - // } - // items, err := c.List(ctx, options) - // if err != nil { - // return nil, err - // } - // list, ok := items.(*v1alpha2.ClusterPolicyReportList) - // if !ok { - // return nil, fmt.Errorf("failed to convert runtime object into cluster policy report list") - // } - // events := make([]watch.Event, len(list.Items)) - // for i, pol := range list.Items { - // report := pol.DeepCopy() - // events[i] = watch.Event{ - // Type: watch.Added, - // Object: report, - // } - // } - // return c.broadcaster.WatchWithPrefix(events) + switch options.ResourceVersion { + case "", "0": + return c.broadcaster.Watch() + default: + break + } + items, err := c.List(ctx, options) + if err != nil { + return nil, err + } + list, ok := items.(*v1alpha2.ClusterPolicyReportList) + if !ok { + return nil, fmt.Errorf("failed to convert runtime object into cluster policy report list") + } + events := make([]watch.Event, len(list.Items)) + for i, pol := range list.Items { + report := pol.DeepCopy() + events[i] = watch.Event{ + Type: watch.Added, + Object: report, + } + } + return c.broadcaster.WatchWithPrefix(events) } func (c *cpolrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { diff --git a/pkg/api/ephr.go b/pkg/api/ephr.go index 8e84d05..d71fced 100644 --- a/pkg/api/ephr.go +++ b/pkg/api/ephr.go @@ -294,30 +294,29 @@ func (p *ephrStore) DeleteCollection(ctx context.Context, deleteValidation rest. func (p *ephrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching ephemeral reports rv=%s", options.ResourceVersion) - return p.broadcaster.Watch() - // switch options.ResourceVersion { - // case "", "0": - // return p.broadcaster.Watch() - // default: - // break - // } - // items, err := p.List(ctx, options) - // if err != nil { - // return nil, err - // } - // list, ok := items.(*reportsv1.EphemeralReportList) - // if !ok { - // return nil, fmt.Errorf("failed to convert runtime object into ephemeral report list") - // } - // events := make([]watch.Event, len(list.Items)) - // for i, pol := range list.Items { - // report := pol.DeepCopy() - // events[i] = watch.Event{ - // Type: watch.Added, - // Object: report, - // } - // } - // return p.broadcaster.WatchWithPrefix(events) + switch options.ResourceVersion { + case "", "0": + return p.broadcaster.Watch() + default: + break + } + items, err := p.List(ctx, options) + if err != nil { + return nil, err + } + list, ok := items.(*reportsv1.EphemeralReportList) + if !ok { + return nil, fmt.Errorf("failed to convert runtime object into ephemeral report list") + } + events := make([]watch.Event, len(list.Items)) + for i, pol := range list.Items { + report := pol.DeepCopy() + events[i] = watch.Event{ + Type: watch.Added, + Object: report, + } + } + return p.broadcaster.WatchWithPrefix(events) } func (p *ephrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { diff --git a/pkg/api/polr.go b/pkg/api/polr.go index 21f78d9..717fec5 100644 --- a/pkg/api/polr.go +++ b/pkg/api/polr.go @@ -294,30 +294,29 @@ func (p *polrStore) DeleteCollection(ctx context.Context, deleteValidation rest. func (p *polrStore) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) { klog.Infof("watching policy reports rv=%s", options.ResourceVersion) - return p.broadcaster.Watch() - // switch options.ResourceVersion { - // case "", "0": - // return p.broadcaster.Watch() - // default: - // break - // } - // items, err := p.List(ctx, options) - // if err != nil { - // return nil, err - // } - // list, ok := items.(*v1alpha2.PolicyReportList) - // if !ok { - // return nil, fmt.Errorf("failed to convert runtime object into policy report list") - // } - // events := make([]watch.Event, len(list.Items)) - // for i, pol := range list.Items { - // report := pol.DeepCopy() - // events[i] = watch.Event{ - // Type: watch.Added, - // Object: report, - // } - // } - // return p.broadcaster.WatchWithPrefix(events) + switch options.ResourceVersion { + case "", "0": + return p.broadcaster.Watch() + default: + break + } + items, err := p.List(ctx, options) + if err != nil { + return nil, err + } + list, ok := items.(*v1alpha2.PolicyReportList) + if !ok { + return nil, fmt.Errorf("failed to convert runtime object into policy report list") + } + events := make([]watch.Event, len(list.Items)) + for i, pol := range list.Items { + report := pol.DeepCopy() + events[i] = watch.Event{ + Type: watch.Added, + Object: report, + } + } + return p.broadcaster.WatchWithPrefix(events) } func (p *polrStore) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) { From a52d85d16c5b18777a7928675ee9bbf94692bfb4 Mon Sep 17 00:00:00 2001 From: Zach Stone Date: Wed, 10 Jul 2024 09:09:41 -0400 Subject: [PATCH 3/4] Enable builtin metrics and add default ServiceMonitor (#159) * Create sync-from-upstream.yaml Signed-off-by: Zach Stone * Update sync-from-upstream.yaml Signed-off-by: Zach Stone * fix(charts): remove erroneous 'metadata' key from ClusterRole object (#119) Signed-off-by: Mike Dougherty Co-authored-by: Jim Bugwadia Signed-off-by: Zach Stone * Enable metrics endpoint and add service monitor Signed-off-by: Zach Stone * Update generated install Signed-off-by: Zach Stone * Do not enable ServiceMonitor by default Signed-off-by: Zach Stone * Rerun codegen Signed-off-by: Zach Stone --------- Signed-off-by: Zach Stone Signed-off-by: Mike Dougherty Co-authored-by: Mike Dougherty Co-authored-by: Jim Bugwadia --- charts/reports-server/README.md | 7 ++++ .../reports-server/templates/deployment.yaml | 3 ++ .../templates/service-monitor.yaml | 36 +++++++++++++++++++ charts/reports-server/values.yaml | 23 ++++++++++++ config/install-inmemory.yaml | 1 + config/install.yaml | 1 + 6 files changed, 71 insertions(+) create mode 100644 charts/reports-server/templates/service-monitor.yaml diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md index af4b078..95ee74e 100644 --- a/charts/reports-server/README.md +++ b/charts/reports-server/README.md @@ -44,6 +44,13 @@ helm install reports-server --namespace reports-server --create-namespace report | securityContext | object | See [values.yaml](values.yaml) | Container security context | | livenessProbe | object | `{"failureThreshold":10,"httpGet":{"path":"/livez","port":"https","scheme":"HTTPS"},"initialDelaySeconds":20,"periodSeconds":10}` | Liveness probe | | readinessProbe | object | `{"failureThreshold":10,"httpGet":{"path":"/readyz","port":"https","scheme":"HTTPS"},"initialDelaySeconds":30,"periodSeconds":10}` | Readiness probe | +| metrics.enabled | bool | `true` | Enable prometheus metrics | +| metrics.serviceMonitor.enabled | bool | `false` | Enable service monitor for scraping prometheus metrics | +| metrics.serviceMonitor.additionalLabels | object | `{}` | Service monitor additional labels | +| metrics.serviceMonitor.interval | string | `""` | Service monitor scrape interval | +| metrics.serviceMonitor.metricRelabelings | list | `[]` | Service monitor metric relabelings | +| metrics.serviceMonitor.relabelings | list | `[]` | Service monitor relabelings | +| metrics.serviceMonitor.scrapeTimeout | string | `""` | Service monitor scrape timeout | | resources.limits | string | `nil` | Container resource limits | | resources.requests | string | `nil` | Container resource requests | | autoscaling.enabled | bool | `false` | Enable autoscaling | diff --git a/charts/reports-server/templates/deployment.yaml b/charts/reports-server/templates/deployment.yaml index e8dbb0a..5e68bc2 100644 --- a/charts/reports-server/templates/deployment.yaml +++ b/charts/reports-server/templates/deployment.yaml @@ -51,6 +51,9 @@ spec: {{- end }} - --cert-dir=/tmp - --secure-port=4443 + {{- if .Values.metrics.enabled }} + - --authorization-always-allow-paths=/metrics + {{- end }} {{- if .Values.config.db.secretName }} env: - name: DB_HOST diff --git a/charts/reports-server/templates/service-monitor.yaml b/charts/reports-server/templates/service-monitor.yaml new file mode 100644 index 0000000..74e5fe8 --- /dev/null +++ b/charts/reports-server/templates/service-monitor.yaml @@ -0,0 +1,36 @@ +{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled -}} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "reports-server.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "reports-server.labels" . | nindent 4 }} + {{- with .Values.metrics.serviceMonitor.additionalLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + selector: + matchLabels: + {{- include "reports-server.selectorLabels" . | nindent 6 }} + endpoints: + - port: https + path: /metrics + scheme: https + tlsConfig: + insecureSkipVerify: true + {{- if .Values.metrics.serviceMonitor.interval}} + interval: {{ .Values.metrics.serviceMonitor.interval }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.scrapeTimeout}} + scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} + {{- end }} + {{- with .Values.metrics.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.metrics.serviceMonitor.relabelings }} + relabelings: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end -}} diff --git a/charts/reports-server/values.yaml b/charts/reports-server/values.yaml index b051eac..4a2c052 100644 --- a/charts/reports-server/values.yaml +++ b/charts/reports-server/values.yaml @@ -98,6 +98,29 @@ readinessProbe: port: https scheme: HTTPS +metrics: + # -- Enable prometheus metrics + enabled: true + + serviceMonitor: + # -- Enable service monitor for scraping prometheus metrics + enabled: false + + # -- Service monitor additional labels + additionalLabels: {} + + # -- Service monitor scrape interval + interval: "" + + # -- Service monitor metric relabelings + metricRelabelings: [] + + # -- Service monitor relabelings + relabelings: [] + + # -- Service monitor scrape timeout + scrapeTimeout: "" + # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following diff --git a/config/install-inmemory.yaml b/config/install-inmemory.yaml index 01f0893..266bf72 100644 --- a/config/install-inmemory.yaml +++ b/config/install-inmemory.yaml @@ -172,6 +172,7 @@ spec: - --debug - --cert-dir=/tmp - --secure-port=4443 + - --authorization-always-allow-paths=/metrics securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/config/install.yaml b/config/install.yaml index 14cb10c..5215cd5 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -267,6 +267,7 @@ spec: - --dbsslcert= - --cert-dir=/tmp - --secure-port=4443 + - --authorization-always-allow-paths=/metrics securityContext: allowPrivilegeEscalation: false capabilities: From d35a9b859980385bb920a4c9c6895956c0b5c70f Mon Sep 17 00:00:00 2001 From: Vishal Choudhary Date: Fri, 26 Jul 2024 14:24:28 +0530 Subject: [PATCH 4/4] release 0.1.0 Signed-off-by: Vishal Choudhary --- charts/reports-server/Chart.yaml | 4 ++-- charts/reports-server/README.md | 2 +- config/install-inmemory.yaml | 32 ++++++++++++++++---------------- config/install.yaml | 32 ++++++++++++++++---------------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/charts/reports-server/Chart.yaml b/charts/reports-server/Chart.yaml index f125bd7..1184296 100644 --- a/charts/reports-server/Chart.yaml +++ b/charts/reports-server/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: reports-server type: application -version: 0.1.0-alpha.1 -appVersion: v0.1.0-alpha.1 +version: 0.1.0 +appVersion: v0.1.0 keywords: - kubernetes - policy reports storage diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md index 95ee74e..ce9f146 100644 --- a/charts/reports-server/README.md +++ b/charts/reports-server/README.md @@ -1,6 +1,6 @@ # reports-server -![Version: 0.1.0-alpha.1](https://img.shields.io/badge/Version-0.1.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.0-alpha.1](https://img.shields.io/badge/AppVersion-v0.1.0--alpha.1-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) TODO diff --git a/config/install-inmemory.yaml b/config/install-inmemory.yaml index 266bf72..8370408 100644 --- a/config/install-inmemory.yaml +++ b/config/install-inmemory.yaml @@ -10,10 +10,10 @@ metadata: name: reports-server namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm --- apiVersion: rbac.authorization.k8s.io/v1 @@ -24,10 +24,10 @@ metadata: rbac.authorization.k8s.io/aggregate-to-admin: 'true' rbac.authorization.k8s.io/aggregate-to-edit: 'true' rbac.authorization.k8s.io/aggregate-to-view: 'true' - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm rules: - apiGroups: @@ -80,10 +80,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -100,10 +100,10 @@ metadata: name: reports-server namespace: kube-system labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -120,10 +120,10 @@ metadata: name: reports-server namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -142,10 +142,10 @@ metadata: name: reports-server namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm spec: strategy: @@ -222,10 +222,10 @@ metadata: name: v1alpha2.wgpolicyk8s.io namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm kube-aggregator.kubernetes.io/automanaged: "false" annotations: @@ -246,10 +246,10 @@ metadata: name: v1.reports.kyverno.io namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm kube-aggregator.kubernetes.io/automanaged: "false" annotations: diff --git a/config/install.yaml b/config/install.yaml index 5215cd5..0bf845b 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -23,10 +23,10 @@ metadata: name: reports-server namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm --- apiVersion: v1 @@ -53,10 +53,10 @@ metadata: rbac.authorization.k8s.io/aggregate-to-admin: 'true' rbac.authorization.k8s.io/aggregate-to-edit: 'true' rbac.authorization.k8s.io/aggregate-to-view: 'true' - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm rules: - apiGroups: @@ -109,10 +109,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -129,10 +129,10 @@ metadata: name: reports-server namespace: kube-system labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -208,10 +208,10 @@ metadata: name: reports-server namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -230,10 +230,10 @@ metadata: name: reports-server namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm spec: strategy: @@ -486,10 +486,10 @@ metadata: name: v1alpha2.wgpolicyk8s.io namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm kube-aggregator.kubernetes.io/automanaged: "false" annotations: @@ -510,10 +510,10 @@ metadata: name: v1.reports.kyverno.io namespace: reports-server labels: - helm.sh/chart: reports-server-0.1.0-alpha.1 + helm.sh/chart: reports-server-0.1.0 app.kubernetes.io/name: reports-server app.kubernetes.io/instance: reports-server - app.kubernetes.io/version: "v0.1.0-alpha.1" + app.kubernetes.io/version: "v0.1.0" app.kubernetes.io/managed-by: Helm kube-aggregator.kubernetes.io/automanaged: "false" annotations: