Merge pull request #1 from RedesignScience/chart

Chart

Author: jacobredesign

.github/workflows/release.yml

@@ -2,15 +2,6 @@ apiVersion: v2
 name: kubernetes-event-exporter
 description: Export Kubernetes events to multiple destinations with routing and filtering
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
+version: 0.2.0
+appVersion: "v1.1"
 home: https://github.com/resmoio/kubernetes-event-exporter

.github/workflows/test.yml

@@ -30,12 +30,6 @@ See [App Configuration](../../README.md) for reference.
 
 ## Install Chart
 
-Ensure `monitoring` namespace exists
-
-```shell
-kubectl create ns monitoring
-```
-
 Install chart
 
 ```bash

charts/kubernetes-event-exporter/Chart.yaml

@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   name: {{ include "kubernetes-event-exporter.fullname" . }}-cfg
   namespace: {{ template "kubernetes-event-exporter.namespace" . }}
+  labels:
+    {{- include "kubernetes-event-exporter.labels" . | nindent 4 }}
 data:
   config.yaml: |
 {{ .Values.config | indent 4 }}

charts/kubernetes-event-exporter/README.md

@@ -1,23 +1,33 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   name: {{ include "kubernetes-event-exporter.fullname" . }}
   namespace: {{ include "kubernetes-event-exporter.namespace" . }}
+  labels:
+    {{- include "kubernetes-event-exporter.labels" . | nindent 4 }}
+  {{- with .Values.deploymentLabels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "kubernetes-event-exporter.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
         {{- include "kubernetes-event-exporter.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
+      {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -28,7 +38,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.global.imageRegistry | default .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: metrics
@@ -47,6 +57,9 @@ spec:
           volumeMounts:
             - mountPath: /data
               name: cfg
+          {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -61,7 +74,14 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: cfg
           configMap:
             name: {{ include "kubernetes-event-exporter.fullname" . }}-cfg
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/kubernetes-event-exporter/templates/configmap.yaml

@@ -1,11 +1,11 @@
 {{- if .Values.rbac.create }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: {{ .Values.rbac.namespaced | ternary "Role" "ClusterRole" }}
 metadata:
   name: {{ include "kubernetes-event-exporter.fullname" . }}
+  labels:
+    {{- include "kubernetes-event-exporter.labels" . | nindent 4 }}
 rules:
-  - apiGroups: ["*"]
-    resources: ["*"]
-    verbs: ["get", "watch", "list"]
+{{ toYaml .Values.rbac.rules }}
 {{- end -}}

charts/kubernetes-event-exporter/templates/deployment.yaml

@@ -1,9 +1,11 @@
 {{- if .Values.rbac.create }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: {{ .Values.rbac.namespaced | ternary "RoleBinding" "ClusterRoleBinding" }}
 metadata:
-    name: {{ include "kubernetes-event-exporter.fullname" . }}
+  name: {{ include "kubernetes-event-exporter.fullname" . }}
+  labels:
+    {{- include "kubernetes-event-exporter.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/kubernetes-event-exporter/templates/role.yaml

@@ -4,4 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ include "kubernetes-event-exporter.serviceAccountName" . }}
   namespace: {{ include "kubernetes-event-exporter.namespace" . }}
+  labels:
+    {{- include "kubernetes-event-exporter.labels" . | nindent 4 }}
 {{- end }}

charts/kubernetes-event-exporter/templates/rolebinding.yaml

@@ -0,0 +1,47 @@
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "kubernetes-event-exporter.fullname" .  }}
+  {{- if .Values.serviceMonitor.namespace }}
+  namespace: {{ . }}
+  {{- else }}
+  namespace: {{ include "kubernetes-event-exporter.namespace" . }}
+  {{- end }}
+  labels:
+    {{- include "kubernetes-event-exporter.labels" . | nindent 4 }}
+spec:
+  endpoints:
+    - port: metrics
+    {{- if .Values.serviceMonitor.interval }}
+      interval: {{ .Values.serviceMonitor.interval }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.scheme }}
+      scheme: {{ .Values.serviceMonitor.scheme }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.bearerTokenFile }}
+      bearerTokenFile: {{ .Values.serviceMonitor.bearerTokenFile }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.tlsConfig }}
+      tlsConfig: {{ toYaml .Values.serviceMonitor.tlsConfig | nindent 6 }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    {{- end }}
+      path: /metrics
+      honorLabels: {{ .Values.serviceMonitor.honorLabels }}
+    {{- if .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+    {{- tpl (toYaml .Values.serviceMonitor.metricRelabelings | nindent 4) . }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.relabelings }}
+      relabelings:
+    {{ toYaml .Values.serviceMonitor.relabelings | nindent 4 }}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ template "kubernetes-event-exporter.namespace" . }}
+  selector:
+    matchLabels:
+      {{- include "kubernetes-event-exporter.selectorLabels" . | nindent 6 }}
+{{- end -}}