fix(cilium-mixin): manifests and default values (#818)

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
portefaix · May 27, 2024 · 46561ad · 46561ad
1 parent 51ed65a
commit 46561ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/charts/cilium-mixin/Chart.yaml b/charts/cilium-mixin/Chart.yaml
@@ -27,7 +27,7 @@ keywords:
   - cilium
   - monitoring-mixin
   - portefaix
-version: 0.2.0
+version: 0.2.1
 appVersion: master
 
 maintainers:
@@ -52,5 +52,5 @@ annotations:
     fingerprint: C39918B3EBDE35C23B8D0B8E5F99269A6FCA437C
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
-      description: cilium-mixin vmaster
+    - kind: fixed
+      description: prometheus rule and dashboards templates
diff --git a/charts/cilium-mixin/README.md b/charts/cilium-mixin/README.md
@@ -1,6 +1,6 @@
 # cilium-mixin
 
-![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: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 A Helm chart for Cilium mixin
 
@@ -29,6 +29,7 @@ A Helm chart for Cilium mixin
 | grafanaDashboard.grafanaOperator.enabled | bool | `false` |  |
 | grafanaDashboard.grafanaOperator.matchLabels | object | `{}` | Selected labels for Grafana instance |
 | monitor.additionalLabels | object | `{}` | Additional labels to add to resources managed by the Prometheus Operator |
+| monitor.enabled | bool | `true` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/cilium-mixin/templates/NOTES.txt b/charts/cilium-mixin/templates/NOTES.txt
@@ -3,7 +3,6 @@
 
 {{ if .Values.grafanaDashboard.enabled -}}
   kubectl --namespace {{ template "cilium-mixin.namespace" . }} get configmap -l "app.kubernetes.io/name={{ include "cilium-mixin.name" . }}"
-{{- end }}
 {{ if $.Values.grafanaDashboard.grafanaOperator.enabled -}}
   kubectl --namespace {{ template "cilium-mixin.namespace" . }} get configmap -l "app.kubernetes.io/name={{ include "cilium-mixin.name" . }}"
 {{- end }}

diff --git a/charts/cilium-mixin/templates/_helpers.tpl b/charts/cilium-mixin/templates/_helpers.tpl
@@ -56,6 +56,15 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end }}
 
+{{/*
+Common annotations
+*/}}
+{{- define "cilium-mixin.annotations" }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations }}
+{{- end }}
+{{- end }}
+
 {{/*
 Allow the release namespace to be overridden
 */}}

diff --git a/charts/cilium-mixin/values.yaml b/charts/cilium-mixin/values.yaml
@@ -31,6 +31,7 @@ additionalAnnotations: {}
   # role: opentelemetry
 
 monitor:
+  enabled: true
   # -- Additional labels to add to resources managed by the Prometheus Operator
   additionalLabels: {}
     # release: kube-prometheus-stack