From b22694d3c232feb8cfde0454ab4c8aaf39bfc6e4 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Tue, 1 Dec 2020 16:38:55 +0500 Subject: [PATCH 1/4] Add servicemonitor in values template --- .../kubernetes/templates/chart/values.yaml.tmpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index e7624f4b..bada980a 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -104,3 +104,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 + From 5fd275a05c51a061ea2a24a236e1ad2fb51b4140 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Tue, 1 Dec 2020 16:39:11 +0500 Subject: [PATCH 2/4] Add waleed as reviewer and approver --- deployments/kubernetes/chart/reloader/OWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deployments/kubernetes/chart/reloader/OWNERS b/deployments/kubernetes/chart/reloader/OWNERS index 31ea124b..763643df 100644 --- 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 From 27815ea3b3ac4334eaa3cce6cf2f9948112ddb2c Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Tue, 1 Dec 2020 16:48:10 +0500 Subject: [PATCH 3/4] Update values.service.ports to values.service.port --- deployments/kubernetes/chart/reloader/values.yaml | 7 ++++--- deployments/kubernetes/templates/chart/values.yaml.tmpl | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 4842df26..ebf76681 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -78,10 +78,11 @@ reloader: pod: annotations: {} - service: {} + service: + {} # labels: {} # annotations: {} - # ports: + # port: # - port: 9090 # name: http # protocol: TCP @@ -97,7 +98,7 @@ reloader: labels: {} # The name of the ServiceAccount to use. # If not set and create is true, a name is generated using the fullname template - name: + name: # Optional flags to pass to the Reloader entrypoint # Example: # custom_annotations: diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index bada980a..28ce9044 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -81,7 +81,7 @@ reloader: service: {} # labels: {} # annotations: {} - # ports: + # port: # - port: 9090 # name: http # protocol: TCP From 5edd29b8e9367410f019f140af97048de327dac2 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Tue, 1 Dec 2020 16:58:51 +0500 Subject: [PATCH 4/4] Remove redundant fields from service in helm chart --- deployments/kubernetes/chart/reloader/values.yaml | 6 +----- deployments/kubernetes/templates/chart/values.yaml.tmpl | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index ebf76681..d9ecd310 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -82,11 +82,7 @@ reloader: {} # labels: {} # annotations: {} - # port: - # - port: 9090 - # name: http - # protocol: TCP - # targetPort: 9090 + # port: 9090 rbac: enabled: true diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index 28ce9044..5e707e16 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -81,11 +81,7 @@ reloader: service: {} # labels: {} # annotations: {} - # port: - # - port: 9090 - # name: http - # protocol: TCP - # targetPort: 9090 + # port: 9090 rbac: enabled: true