Bump Version to v0.0.75

Merge pull request #184 from stakater/fix-helm-chart-template
Fix helm chart template
2026-02-14 18:09:50 +00:00 · 2020-12-01 12:11:52 +00:00 · 2020-12-01 17:02:49 +05:00 · 2020-12-01 16:58:51 +05:00 · 2020-12-01 16:48:10 +05:00 · 2020-12-01 16:39:11 +05:00
13 changed files with 90 additions and 31 deletions
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-version: v0.0.74
+version: v0.0.75
--- a/README.md
+++ b/README.md
@@ -225,6 +225,8 @@ Reloader can be configured to ignore the resources `secrets` and `configmaps` by

 You can also set the log format of Reloader to json by setting `logFormat` to `json` in values.yaml and apply the chart

+You can enable to scrape Reloader's Prometheus metrics by setting `serviceMonitor.enabled`  to `true` in values.yaml file.
+
 ## Help

 ### Documentation
--- a/deployments/kubernetes/chart/reloader/Chart.yaml
+++ b/deployments/kubernetes/chart/reloader/Chart.yaml
@@ -3,8 +3,8 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: v0.0.74
-appVersion: v0.0.74
+version: v0.0.75
+appVersion: v0.0.75
 keywords:
  - Reloader
  - kubernetes
--- a/deployments/kubernetes/chart/reloader/OWNERS
+++ b/deployments/kubernetes/chart/reloader/OWNERS
@@ -5,6 +5,7 @@ approvers:
 - waseem-h
 - rasheedamir
 - ahsan-storm
+- ahmedwaleedmalik
 reviewers:
 - faizanahmad055
 - kahootali
@@ -12,3 +13,4 @@ reviewers:
 - waseem-h
 - rasheedamir
 - ahsan-storm
+- ahmedwaleedmalik
--- a/deployments/kubernetes/chart/reloader/templates/servicemonitor.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/servicemonitor.yaml
@@ -0,0 +1,31 @@
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.reloader.serviceMonitor.enabled ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+{{ include "reloader-labels.chart" . | indent 4 }}
+{{- if .Values.reloader.serviceMonitor.labels }}
+{{ toYaml .Values.reloader.serviceMonitor.labels | indent 4}}
+{{- end }}
+  name: {{ template "reloader-fullname" . }}
+{{- if .Values.reloader.serviceMonitor.namespace }}
+  namespace: {{ .Values.reloader.serviceMonitor.namespace }}
+{{- end }}
+spec:
+  endpoints:
+  - targetPort: http
+    path: "/metrics"
+{{- if .Values.reloader.serviceMonitor.interval }}
+    interval: {{ .Values.reloader.serviceMonitor.interval }}
+{{- end }}
+{{- if .Values.reloader.serviceMonitor.timeout }}
+    scrapeTimeout: {{ .Values.reloader.serviceMonitor.timeout }}
+{{- end }}
+  jobLabel: {{ template "reloader-fullname" . }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{ include "reloader-labels.chart" . | nindent 6 }}
+{{- end }}
--- a/deployments/kubernetes/chart/reloader/values.yaml
+++ b/deployments/kubernetes/chart/reloader/values.yaml
@@ -51,10 +51,10 @@ reloader:
    labels:
      provider: stakater
      group: com.stakater.platform
-      version: v0.0.74
+      version: v0.0.75
    image:
      name: stakater/reloader
-      tag: "v0.0.74"
+      tag: "v0.0.75"
      pullPolicy: IfNotPresent
    # Support for extra environment variables.
    env:
@@ -81,11 +81,7 @@ reloader:
  service: {}
    # labels: {}
    # annotations: {}
-    # ports:
-    # - port: 9090
-    #   name: http
-    #   protocol: TCP
-    #   targetPort: 9090
+    # port: 9090

  rbac:
    enabled: true
@@ -104,3 +100,15 @@ reloader:
  #     configmap: "my.company.com/configmap"
  #     secret: "my.company.com/secret"
  custom_annotations: {}
+  serviceMonitor:
+    # enabling this requires service to be enabled as well, or no endpoints will be found
+    enabled: false
+    # Set the namespace the ServiceMonitor should be deployed
+    # namespace: monitoring
+    # Set how frequently Prometheus should scrape
+    # interval: 30s
+    # Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator
+    # labels:
+    # Set timeout for scrape
+    # timeout: 10s
+  
--- a/deployments/kubernetes/manifests/clusterrole.yaml
+++ b/deployments/kubernetes/manifests/clusterrole.yaml
@@ -9,7 +9,7 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
--- a/deployments/kubernetes/manifests/clusterrolebinding.yaml
+++ b/deployments/kubernetes/manifests/clusterrolebinding.yaml
@@ -9,7 +9,7 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
--- a/deployments/kubernetes/manifests/deployment.yaml
+++ b/deployments/kubernetes/manifests/deployment.yaml
@@ -8,13 +8,13 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
    group: com.stakater.platform
    provider: stakater
-    version: v0.0.74
+    version: v0.0.75
    
  name: reloader-reloader
 spec:
@@ -28,17 +28,17 @@ spec:
    metadata:
      labels:
        app: reloader-reloader
-        chart: "reloader-v0.0.74"
+        chart: "reloader-v0.0.75"
        release: "reloader"
        heritage: "Tiller"
        app.kubernetes.io/managed-by: "Tiller"
        group: com.stakater.platform
        provider: stakater
-        version: v0.0.74
+        version: v0.0.75
        
    spec:
      containers:
-      - image: "stakater/reloader:v0.0.74"
+      - image: "stakater/reloader:v0.0.75"
        imagePullPolicy: IfNotPresent
        name: reloader-reloader

--- a/deployments/kubernetes/manifests/serviceaccount.yaml
+++ b/deployments/kubernetes/manifests/serviceaccount.yaml
@@ -9,7 +9,7 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
--- a/deployments/kubernetes/manifests/servicemonitor.yaml
+++ b/deployments/kubernetes/manifests/servicemonitor.yaml
@@ -0,0 +1,4 @@
+---
+# Source: reloader/templates/servicemonitor.yaml
+
+
--- a/deployments/kubernetes/reloader.yaml
+++ b/deployments/kubernetes/reloader.yaml
@@ -9,7 +9,7 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
@@ -58,7 +58,7 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
@@ -83,13 +83,13 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
    group: com.stakater.platform
    provider: stakater
-    version: v0.0.74
+    version: v0.0.75
    
  name: reloader-reloader
 spec:
@@ -103,17 +103,17 @@ spec:
    metadata:
      labels:
        app: reloader-reloader
-        chart: "reloader-v0.0.74"
+        chart: "reloader-v0.0.75"
        release: "reloader"
        heritage: "Tiller"
        app.kubernetes.io/managed-by: "Tiller"
        group: com.stakater.platform
        provider: stakater
-        version: v0.0.74
+        version: v0.0.75
        
    spec:
      containers:
-      - image: "stakater/reloader:v0.0.74"
+      - image: "stakater/reloader:v0.0.75"
        imagePullPolicy: IfNotPresent
        name: reloader-reloader

@@ -157,9 +157,13 @@ metadata:
    meta.helm.sh/release-name: "reloader"
  labels:
    app: reloader-reloader
-    chart: "reloader-v0.0.74"
+    chart: "reloader-v0.0.75"
    release: "reloader"
    heritage: "Tiller"
    app.kubernetes.io/managed-by: "Tiller"
  name: reloader-reloader

+---
+# Source: reloader/templates/servicemonitor.yaml
+
+
--- a/deployments/kubernetes/templates/chart/values.yaml.tmpl
+++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl
@@ -81,11 +81,7 @@ reloader:
  service: {}
    # labels: {}
    # annotations: {}
-    # ports:
-    # - port: 9090
-    #   name: http
-    #   protocol: TCP
-    #   targetPort: 9090
+    # port: 9090

  rbac:
    enabled: true
@@ -104,3 +100,15 @@ reloader:
  #     configmap: "my.company.com/configmap"
  #     secret: "my.company.com/secret"
  custom_annotations: {}
+  serviceMonitor:
+    # enabling this requires service to be enabled as well, or no endpoints will be found
+    enabled: false
+    # Set the namespace the ServiceMonitor should be deployed
+    # namespace: monitoring
+    # Set how frequently Prometheus should scrape
+    # interval: 30s
+    # Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator
+    # labels:
+    # Set timeout for scrape
+    # timeout: 10s
+
Author	SHA1	Message	Date
stakater-user	631781aa8a	Bump Version to v0.0.75	2020-12-01 12:11:52 +00:00
Ali Kahoot	707dccf6b8	Merge pull request #184 from stakater/fix-helm-chart-template Fix helm chart template	2020-12-01 17:02:49 +05:00
Waleed Malik	5edd29b8e9	Remove redundant fields from service in helm chart	2020-12-01 16:58:51 +05:00
Waleed Malik	27815ea3b3	Update values.service.ports to values.service.port	2020-12-01 16:48:10 +05:00
Waleed Malik	5fd275a05c	Add waleed as reviewer and approver	2020-12-01 16:39:11 +05:00
Waleed Malik	b22694d3c2	Add servicemonitor in values template	2020-12-01 16:38:55 +05:00
Ahmed Waleed Malik	5c95c6898b	Merge pull request #180 from dpetersen/service-monitor Add optional ServiceMonitor object to Helm chart	2020-12-01 15:08:00 +05:00
Jose Bautista	46bc4b71db	update readme	2020-11-28 17:28:37 +02:00
Don Petersen	cee81b4757	Add optional ServiceMonitor object to Helm chart This adds the ability to create a ServiceMonitor instance to configure Prometheus to monitor reloader for metrics. ServiceMonitor is a CRD that comes with the prometheus-operator project.	2020-11-25 13:25:07 -08:00