From c71d6a65ba01cc7df71ea0b3eddf9a536b453731 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Mon, 10 Dec 2018 20:30:57 +0500 Subject: [PATCH 1/7] [helm/charts] Add reloader in helm charts public repo Signed-off-by: faizanahmad055 --- stable/reloader/.helmignore | 2 + stable/reloader/Chart.yaml | 27 +++ stable/reloader/OWNERS | 14 ++ stable/reloader/README.md | 163 ++++++++++++++++++ stable/reloader/templates/NOTES.txt | 7 + stable/reloader/templates/_helpers.tpl | 34 ++++ stable/reloader/templates/clusterrole.yaml | 38 ++++ .../templates/clusterrolebinding.yaml | 24 +++ stable/reloader/templates/deployment.yaml | 73 ++++++++ stable/reloader/templates/role.yaml | 37 ++++ stable/reloader/templates/rolebinding.yaml | 24 +++ stable/reloader/templates/serviceaccount.yaml | 14 ++ stable/reloader/values.yaml | 32 ++++ 13 files changed, 489 insertions(+) create mode 100644 stable/reloader/.helmignore create mode 100644 stable/reloader/Chart.yaml create mode 100644 stable/reloader/OWNERS create mode 100644 stable/reloader/README.md create mode 100644 stable/reloader/templates/NOTES.txt create mode 100644 stable/reloader/templates/_helpers.tpl create mode 100644 stable/reloader/templates/clusterrole.yaml create mode 100644 stable/reloader/templates/clusterrolebinding.yaml create mode 100644 stable/reloader/templates/deployment.yaml create mode 100644 stable/reloader/templates/role.yaml create mode 100644 stable/reloader/templates/rolebinding.yaml create mode 100644 stable/reloader/templates/serviceaccount.yaml create mode 100644 stable/reloader/values.yaml diff --git a/stable/reloader/.helmignore b/stable/reloader/.helmignore new file mode 100644 index 000000000000..9e1690881f44 --- /dev/null +++ b/stable/reloader/.helmignore @@ -0,0 +1,2 @@ +# OWNERS file for Kubernetes +OWNERS diff --git a/stable/reloader/Chart.yaml b/stable/reloader/Chart.yaml new file mode 100644 index 000000000000..d655c14ad316 --- /dev/null +++ b/stable/reloader/Chart.yaml @@ -0,0 +1,27 @@ +# Generated from deployments/kubernetes/templates/chart/Chart.yaml.tmpl + +apiVersion: v1 +name: reloader +description: Reloader chart that runs on kubernetes +version: 0.0.18 +appVersion: 0.0.18 +keywords: + - Reloader + - kubernetes +home: https://github.com/stakater/Reloader +sources: +- https://github.com/stakater/IngressMonitorController +icon: https://raw.githubusercontent.com/stakater/Reloader/master/assets/web/reloader-round-100px.png +maintainers: +- name: rasheedamir + email: rasheed@aurorasolutions.io +- name: waseem-h + email: waseemhassan@stakater.com +- name: faizanahmad055 + email: faizan.ahmad55@outlook.com +- name: kahootali + email: ali.kahoot@aurorasolutions.io +- name: ahmadiq + email: ahmad@aurorasolutions.io +- name: ahsan-storm + email: ahsanmuhammad1@outlook.com diff --git a/stable/reloader/OWNERS b/stable/reloader/OWNERS new file mode 100644 index 000000000000..31ea124be1c6 --- /dev/null +++ b/stable/reloader/OWNERS @@ -0,0 +1,14 @@ +approvers: +- faizanahmad055 +- kahootali +- ahmadiq +- waseem-h +- rasheedamir +- ahsan-storm +reviewers: +- faizanahmad055 +- kahootali +- ahmadiq +- waseem-h +- rasheedamir +- ahsan-storm diff --git a/stable/reloader/README.md b/stable/reloader/README.md new file mode 100644 index 000000000000..e44bf58ffc82 --- /dev/null +++ b/stable/reloader/README.md @@ -0,0 +1,163 @@ +# ![](https://raw.githubusercontent.com/stakater/Reloader/master/assets/web/reloader-round-100px.png) RELOADER + +A Kubernetes controller to watch changes in ConfigMap and Secrets and then restart pods for Deployment, StatefulSet and DaemonSet + +[![Get started with Stakater](https://stakater.github.io/README/stakater-github-banner.png)](http://stakater.com/?utm_source=Reloader&utm_medium=github) + +## Problem + +We would like to watch if some change happens in `ConfigMap` and/or `Secret`; then perform a rolling upgrade on relevant `Deployment`, `Deamonset` and `Statefulset` + +## Solution + +Reloader can watch changes in `ConfigMap` and `Secret` and do rolling upgrades on Pods with their associated `Deployments`, `Deamonsets` and `Statefulsets`. + +## How to use Reloader + +### Configmap + +For a `Deployment` called `foo` have a `ConfigMap` called `foo-configmap`. Then add this annotation to main metadata of your `Deployment` + +```yaml +kind: Deployment +metadata: + annotations: + configmap.reloader.stakater.com/reload: "foo-configmap" +spec: + template: + metadata: +``` + +Use comma separated list to define multiple configmaps. + +```yaml +kind: Deployment +metadata: + annotations: + configmap.reloader.stakater.com/reload: "foo-configmap,bar-configmap,baz-configmap" +spec: + template: + metadata: +``` + +### Secret + +For a `Deployment` called `foo` have a `Secret` called `foo-secret`. Then add this annotation to main metadata of your `Deployment` + +```yaml +kind: Deployment +metadata: + annotations: + secret.reloader.stakater.com/reload: "foo-secret" +spec: + template: + metadata: +``` + +Use comma separated list to define multiple secrets. + +```yaml +kind: Deployment +metadata: + annotations: + secret.reloader.stakater.com/reload: "foo-secret,bar-secret,baz-secret" +spec: + template: + metadata: +``` + +## Usage + +The following quickstart let's you set up Ingress Monitor Controller to register uptime monitors for ingresses/routes in all namespaces: + +Update the `values.yaml` and set the following properties + +| Key | Description | Example | Default Value | +|---------------|---------------------------------------------------------------------------|------------------------------------|------------------------------------| +| watchGlobally | Option to watch configmap and secrets in all namespaces | `true` | `true` | +| matchLabels | Additional match Labels for selector | `{}` | `{}` | +| deployment.annotations | Annotations for deployment | `{}` | `{}` | +| deployment.labels | Labels for deployment | `provider` | `provider` | +| deployment.image.name | Image name for reloader | `stakater/reloader` | `stakater/reloader` | +| deployment.image.tag | Image tag for reloader | `0.0.18` | `0.0.18` | +| deployment.image.pullPolicy | Image pull policy for reloader | `IfNotPresent` | `IfNotPresent` | +| deployment.env.open | Additional key value pair as environment variables | `STORAGE: local` | `` | +| deployment.env.secret | Additional Key value pair as environment variables. It gets the values based on keys from default reloader secret if any | `BASIC_AUTH_USER: test` | `` | +| deployment.env.field | Additional environment variables to expose pod information to containers. | `POD_IP: status.podIP` | `` | +| rbac.enabled | Option to create rbac | `true` | `true` | +| rbac.labels | Additional labels for rbac | `{}` | `{}` | +| serviceAccount.create | Option to create serviceAccount | `true` | `true` | +| serviceAccount.name | Name of serviceAccount | `reloader` | `reloader` | + +## Deploying to Kubernetes + +You can deploy Reloader by following methods: + +### Helm Charts + +Alternatively if you have configured helm on your cluster, you can add reloader to helm from our public chart repository and deploy it via helm using below mentioned commands + + ```bash +helm repo add stable https://kubernetes-charts.storage.googleapis.com/ + +helm repo update + +helm install stable/reloader +``` + +**Note:** By default reloader watches in all namespaces. To watch in single namespace, please run following command. It will install reloader in `test` namespace which will only watch `Deployments`, `Deamonsets` and `Statefulsets` in `test` namespace. + +```bash +helm install stable/reloader --set reloader.watchGlobally=false --namespace test +``` + +## Help + +### Documentation +You can find more documentation [here](https://github.com/stakater/Reloader/tree/master/docs) + +### Have a question? +File a GitHub [issue](https://github.com/stakater/Reloader/issues), or send us an [email](mailto:stakater@gmail.com). + +### Talk to us on Slack + +Join and talk to us on Slack for discussing Reloader + +[![Join Slack](https://stakater.github.io/README/stakater-join-slack-btn.png)](https://stakater-slack.herokuapp.com/) +[![Chat](https://stakater.github.io/README/stakater-chat-btn.png)](https://stakater.slack.com/messages/CC5S05S12) + +## Contributing + +### Bug Reports & Feature Requests + +Please use the [issue tracker](https://github.com/stakater/Reloader/issues) to report any bugs or file feature requests. + +### Developing + +PRs are welcome. In general, we follow the "fork-and-pull" Git workflow. + + 1. **Fork** the repo on GitHub + 2. **Clone** the project to your own machine + 3. **Commit** changes to your own branch + 4. **Push** your work back up to your fork + 5. Submit a **Pull request** so that we can review your changes + +NOTE: Be sure to merge the latest from "upstream" before making a pull request! + +## Changelog + +View our closed [Pull Requests](https://github.com/stakater/Reloader/pulls?q=is%3Apr+is%3Aclosed). + +## License + +Apache2 © [Stakater](http://stakater.com) + +## About + +[Reloader](https://github.com/stakater/Reloader) is maintained by [Stakater][website]. Like it? Please let us know at + +See [our other projects][community] +or contact us in case of professional services and queries on + + [website]: http://stakater.com/ + [community]: https://github.com/stakater/ diff --git a/stable/reloader/templates/NOTES.txt b/stable/reloader/templates/NOTES.txt new file mode 100644 index 000000000000..f2a38752a417 --- /dev/null +++ b/stable/reloader/templates/NOTES.txt @@ -0,0 +1,7 @@ +- For a `Deployment` called `foo` have a `ConfigMap` called `foo-configmap`. Then add this annotation to main metadata of your `Deployment` + configmap.reloader.stakater.com/reload: "foo-configmap" + +- For a `Deployment` called `foo` have a `Secret` called `foo-secret`. Then add this annotation to main metadata of your `Deployment` + secret.reloader.stakater.com/reload: "foo-secret" + +- After successful installation, your pods will get rolling updates when a change in data of configmap or secret will happen. diff --git a/stable/reloader/templates/_helpers.tpl b/stable/reloader/templates/_helpers.tpl new file mode 100644 index 000000000000..e6fc7bb60ce5 --- /dev/null +++ b/stable/reloader/templates/_helpers.tpl @@ -0,0 +1,34 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "reloader-name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" | lower -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "reloader-fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "reloader-labels.chart" -}} +app: {{ template "reloader-name" . }} +chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" +release: {{ .Release.Name | quote }} +heritage: {{ .Release.Service | quote }} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "serviceAccountName" -}} +{{- if .Values.reloader.serviceAccount.create -}} + {{ default (include "reloader-fullname" .) .Values.reloader.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.reloader.serviceAccount.name }} +{{- end -}} +{{- end -}} diff --git a/stable/reloader/templates/clusterrole.yaml b/stable/reloader/templates/clusterrole.yaml new file mode 100644 index 000000000000..f291d4eefb6a --- /dev/null +++ b/stable/reloader/templates/clusterrole.yaml @@ -0,0 +1,38 @@ +--- +{{- if and .Values.reloader.watchGlobally (.Values.reloader.rbac.enabled) }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRole +metadata: + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.rbac.labels }} +{{ toYaml .Values.reloader.rbac.labels | indent 4 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "reloader-name" . }}-role + namespace: {{ .Release.Namespace }} +rules: + - apiGroups: + - "" + resources: + - secrets + - configmaps + verbs: + - list + - get + - watch + - apiGroups: + - "extensions" + - "apps" + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - list + - get + - update + - patch +{{- end }} diff --git a/stable/reloader/templates/clusterrolebinding.yaml b/stable/reloader/templates/clusterrolebinding.yaml new file mode 100644 index 000000000000..6bcaa1b17960 --- /dev/null +++ b/stable/reloader/templates/clusterrolebinding.yaml @@ -0,0 +1,24 @@ +{{- if and .Values.reloader.watchGlobally (.Values.reloader.rbac.enabled) }} +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.rbac.labels }} +{{ toYaml .Values.reloader.rbac.labels | indent 4 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "reloader-name" . }}-role-binding + namespace: {{ .Release.Namespace }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ template "reloader-name" . }}-role +subjects: + - kind: ServiceAccount + name: {{ template "serviceAccountName" . }} + namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/stable/reloader/templates/deployment.yaml b/stable/reloader/templates/deployment.yaml new file mode 100644 index 000000000000..0ad0018ae91e --- /dev/null +++ b/stable/reloader/templates/deployment.yaml @@ -0,0 +1,73 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: +{{- if .Values.reloader.deployment.annotations }} + annotations: +{{ toYaml .Values.reloader.deployment.annotations | indent 4 }} +{{- end }} + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.deployment.labels }} +{{ toYaml .Values.reloader.deployment.labels | indent 4 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "reloader-name" . }} +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: {{ template "reloader-name" . }} + release: {{ .Release.Name | quote }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 6 }} +{{- end }} + template: + metadata: + labels: +{{ include "reloader-labels.chart" . | indent 8 }} +{{- if .Values.reloader.deployment.labels }} +{{ toYaml .Values.reloader.deployment.labels | indent 8 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 8 }} +{{- end }} + spec: + containers: + - env: + {{- range $name, $value := .Values.reloader.deployment.env.open }} + {{- if not (empty $value) }} + - name: {{ $name | quote }} + value: {{ $value | quote }} + {{- end }} + {{- end }} + {{- $secret_name := include "reloader-fullname" . }} + {{- range $name, $value := .Values.reloader.deployment.env.secret }} + {{- if not ( empty $value) }} + - name: {{ $name | quote }} + valueFrom: + secretKeyRef: + name: {{ $secret_name }} + key: {{ $name | quote }} + {{- end }} + {{- end }} + {{- range $name, $value := .Values.reloader.deployment.env.field }} + {{- if not ( empty $value) }} + - name: {{ $name | quote }} + valueFrom: + fieldRef: + fieldPath: {{ $value | quote}} + {{- end }} + {{- end }} + {{- if eq .Values.reloader.watchGlobally false }} + - name: KUBERNETES_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + {{- end }} + image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}" + imagePullPolicy: {{ .Values.reloader.deployment.image.pullPolicy }} + name: {{ template "reloader-name" . }} + serviceAccountName: {{ template "serviceAccountName" . }} diff --git a/stable/reloader/templates/role.yaml b/stable/reloader/templates/role.yaml new file mode 100644 index 000000000000..21c049bca47b --- /dev/null +++ b/stable/reloader/templates/role.yaml @@ -0,0 +1,37 @@ +{{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: Role +metadata: + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.rbac.labels }} +{{ toYaml .Values.reloader.rbac.labels | indent 4 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "reloader-name" . }}-role + namespace: {{ .Release.Namespace }} +rules: + - apiGroups: + - "" + resources: + - secrets + - configmaps + verbs: + - list + - get + - watch + - apiGroups: + - "extensions" + - "apps" + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - list + - get + - update + - patch +{{- end }} diff --git a/stable/reloader/templates/rolebinding.yaml b/stable/reloader/templates/rolebinding.yaml new file mode 100644 index 000000000000..848fb4d87808 --- /dev/null +++ b/stable/reloader/templates/rolebinding.yaml @@ -0,0 +1,24 @@ +{{- if and (not (.Values.reloader.watchGlobally)) (.Values.reloader.rbac.enabled) }} +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: RoleBinding +metadata: + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.rbac.labels }} +{{ toYaml .Values.reloader.rbac.labels | indent 4 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "reloader-name" . }}-role-binding + namespace: {{ .Release.Namespace }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "reloader-name" . }}-role +subjects: + - kind: ServiceAccount + name: {{ template "serviceAccountName" . }} + namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/stable/reloader/templates/serviceaccount.yaml b/stable/reloader/templates/serviceaccount.yaml new file mode 100644 index 000000000000..ceb247c389f7 --- /dev/null +++ b/stable/reloader/templates/serviceaccount.yaml @@ -0,0 +1,14 @@ +{{- if .Values.reloader.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.serviceAccount.labels }} +{{ toYaml .Values.reloader.serviceAccount.labels | indent 4 }} +{{- end }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "serviceAccountName" . }} +{{- end }} diff --git a/stable/reloader/values.yaml b/stable/reloader/values.yaml new file mode 100644 index 000000000000..04199f44fc94 --- /dev/null +++ b/stable/reloader/values.yaml @@ -0,0 +1,32 @@ +reloader: + watchGlobally: true + matchLabels: {} + deployment: + annotations: {} + labels: + provider: stakater + group: com.stakater.platform + image: + name: stakater/reloader + tag: "0.0.18" + pullPolicy: IfNotPresent + # Support for extra environment variables. + env: + # Open supports Key value pair as environment variables. + open: + # secret supports Key value pair as environment variables. It gets the values based on keys from default reloader secret if any. + secret: + # field supports Key value pair as environment variables. It gets the values from other fields of pod. + field: + + rbac: + enabled: true + labels: {} + # Service account config for the agent pods + serviceAccount: + # Specifies whether a ServiceAccount should be created + create: true + labels: {} + # The name of the ServiceAccount to use. + # If not set and create is true, a name is generated using the fullname template + name: reloader From 988a09f756fb7ff7a01e4c1082118dfa9167d850 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Mon, 10 Dec 2018 21:04:19 +0500 Subject: [PATCH 2/7] Update reloader deploymentapiVersion Signed-off-by: faizanahmad055 --- stable/reloader/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/reloader/templates/deployment.yaml b/stable/reloader/templates/deployment.yaml index 0ad0018ae91e..429912843dc1 100644 --- a/stable/reloader/templates/deployment.yaml +++ b/stable/reloader/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: {{- if .Values.reloader.deployment.annotations }} From e22be0d973d0b5d65ca06cf2330846c03bc83480 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Mon, 10 Dec 2018 21:05:33 +0500 Subject: [PATCH 3/7] Update chart.yaml Signed-off-by: faizanahmad055 --- stable/reloader/Chart.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/stable/reloader/Chart.yaml b/stable/reloader/Chart.yaml index d655c14ad316..b0433859d331 100644 --- a/stable/reloader/Chart.yaml +++ b/stable/reloader/Chart.yaml @@ -1,5 +1,3 @@ -# Generated from deployments/kubernetes/templates/chart/Chart.yaml.tmpl - apiVersion: v1 name: reloader description: Reloader chart that runs on kubernetes From 6be0eb5b4188fd4ee625d8004f2a5d04a61cb0f2 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Tue, 11 Dec 2018 12:35:06 +0500 Subject: [PATCH 4/7] Fix selector labels Signed-off-by: faizanahmad055 --- stable/reloader/templates/_helpers.tpl | 7 +++++-- stable/reloader/templates/clusterrole.yaml | 1 + stable/reloader/templates/clusterrolebinding.yaml | 1 + stable/reloader/templates/deployment.yaml | 5 +++-- stable/reloader/templates/role.yaml | 1 + stable/reloader/templates/rolebinding.yaml | 1 + stable/reloader/templates/serviceaccount.yaml | 1 + 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/stable/reloader/templates/_helpers.tpl b/stable/reloader/templates/_helpers.tpl index e6fc7bb60ce5..a149b1cf0dc3 100644 --- a/stable/reloader/templates/_helpers.tpl +++ b/stable/reloader/templates/_helpers.tpl @@ -15,10 +15,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "reloader-labels.chart" -}} +{{- define "reloader-labels.selector" -}} app: {{ template "reloader-name" . }} -chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: {{ .Release.Name | quote }} +{{- end -}} + +{{- define "reloader-labels.chart" -}} +chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" heritage: {{ .Release.Service | quote }} {{- end -}} diff --git a/stable/reloader/templates/clusterrole.yaml b/stable/reloader/templates/clusterrole.yaml index f291d4eefb6a..08d85aaf95ec 100644 --- a/stable/reloader/templates/clusterrole.yaml +++ b/stable/reloader/templates/clusterrole.yaml @@ -5,6 +5,7 @@ kind: ClusterRole metadata: labels: {{ include "reloader-labels.chart" . | indent 4 }} +{{ include "reloader-labels.selector" . | indent 4 }} {{- if .Values.reloader.rbac.labels }} {{ toYaml .Values.reloader.rbac.labels | indent 4 }} {{- end }} diff --git a/stable/reloader/templates/clusterrolebinding.yaml b/stable/reloader/templates/clusterrolebinding.yaml index 6bcaa1b17960..01d909448cc9 100644 --- a/stable/reloader/templates/clusterrolebinding.yaml +++ b/stable/reloader/templates/clusterrolebinding.yaml @@ -5,6 +5,7 @@ kind: ClusterRoleBinding metadata: labels: {{ include "reloader-labels.chart" . | indent 4 }} +{{ include "reloader-labels.selector" . | indent 4 }} {{- if .Values.reloader.rbac.labels }} {{ toYaml .Values.reloader.rbac.labels | indent 4 }} {{- end }} diff --git a/stable/reloader/templates/deployment.yaml b/stable/reloader/templates/deployment.yaml index 429912843dc1..d1baaf920e76 100644 --- a/stable/reloader/templates/deployment.yaml +++ b/stable/reloader/templates/deployment.yaml @@ -7,6 +7,7 @@ metadata: {{- end }} labels: {{ include "reloader-labels.chart" . | indent 4 }} +{{ include "reloader-labels.selector" . | indent 4 }} {{- if .Values.reloader.deployment.labels }} {{ toYaml .Values.reloader.deployment.labels | indent 4 }} {{- end }} @@ -19,14 +20,14 @@ spec: revisionHistoryLimit: 2 selector: matchLabels: - app: {{ template "reloader-name" . }} - release: {{ .Release.Name | quote }} +{{ include "reloader-labels.selector" . | indent 6 }} {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 6 }} {{- end }} template: metadata: labels: +{{ include "reloader-labels.selector" . | indent 8 }} {{ include "reloader-labels.chart" . | indent 8 }} {{- if .Values.reloader.deployment.labels }} {{ toYaml .Values.reloader.deployment.labels | indent 8 }} diff --git a/stable/reloader/templates/role.yaml b/stable/reloader/templates/role.yaml index 21c049bca47b..cff7e69e447a 100644 --- a/stable/reloader/templates/role.yaml +++ b/stable/reloader/templates/role.yaml @@ -4,6 +4,7 @@ kind: Role metadata: labels: {{ include "reloader-labels.chart" . | indent 4 }} +{{ include "reloader-labels.selector" . | indent 4 }} {{- if .Values.reloader.rbac.labels }} {{ toYaml .Values.reloader.rbac.labels | indent 4 }} {{- end }} diff --git a/stable/reloader/templates/rolebinding.yaml b/stable/reloader/templates/rolebinding.yaml index 848fb4d87808..8db19274e0aa 100644 --- a/stable/reloader/templates/rolebinding.yaml +++ b/stable/reloader/templates/rolebinding.yaml @@ -5,6 +5,7 @@ kind: RoleBinding metadata: labels: {{ include "reloader-labels.chart" . | indent 4 }} +{{ include "reloader-labels.selector" . | indent 4 }} {{- if .Values.reloader.rbac.labels }} {{ toYaml .Values.reloader.rbac.labels | indent 4 }} {{- end }} diff --git a/stable/reloader/templates/serviceaccount.yaml b/stable/reloader/templates/serviceaccount.yaml index ceb247c389f7..461dd527e067 100644 --- a/stable/reloader/templates/serviceaccount.yaml +++ b/stable/reloader/templates/serviceaccount.yaml @@ -4,6 +4,7 @@ kind: ServiceAccount metadata: labels: {{ include "reloader-labels.chart" . | indent 4 }} +{{ include "reloader-labels.selector" . | indent 4 }} {{- if .Values.reloader.serviceAccount.labels }} {{ toYaml .Values.reloader.serviceAccount.labels | indent 4 }} {{- end }} From 3b0197f89a98bdc22f5414651f89585bd9eaa8fc Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Wed, 12 Dec 2018 19:25:44 +0500 Subject: [PATCH 5/7] Update chart version Signed-off-by: faizanahmad055 --- stable/reloader/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/reloader/Chart.yaml b/stable/reloader/Chart.yaml index b0433859d331..7dea4bdaaf05 100644 --- a/stable/reloader/Chart.yaml +++ b/stable/reloader/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: reloader description: Reloader chart that runs on kubernetes -version: 0.0.18 +version: 1.0.0 appVersion: 0.0.18 keywords: - Reloader From 4977ac6f32babd525082e08ec39df0fcbe61b785 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Wed, 12 Dec 2018 19:28:21 +0500 Subject: [PATCH 6/7] Update sources Signed-off-by: faizanahmad055 --- stable/reloader/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/reloader/Chart.yaml b/stable/reloader/Chart.yaml index 7dea4bdaaf05..c0126458e940 100644 --- a/stable/reloader/Chart.yaml +++ b/stable/reloader/Chart.yaml @@ -8,7 +8,7 @@ keywords: - kubernetes home: https://github.com/stakater/Reloader sources: -- https://github.com/stakater/IngressMonitorController +- https://github.com/stakater/Reloader icon: https://raw.githubusercontent.com/stakater/Reloader/master/assets/web/reloader-round-100px.png maintainers: - name: rasheedamir From 1d8fe75090788648ae0823646f0ddfaf1b736fa2 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Thu, 13 Dec 2018 19:36:24 +0500 Subject: [PATCH 7/7] Update readme Signed-off-by: faizanahmad055 --- stable/reloader/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/reloader/README.md b/stable/reloader/README.md index e44bf58ffc82..fb5375e5e309 100644 --- a/stable/reloader/README.md +++ b/stable/reloader/README.md @@ -68,7 +68,7 @@ spec: ## Usage -The following quickstart let's you set up Ingress Monitor Controller to register uptime monitors for ingresses/routes in all namespaces: +The following quickstart let's you set up Reloader quickly: Update the `values.yaml` and set the following properties @@ -95,7 +95,7 @@ You can deploy Reloader by following methods: ### Helm Charts -Alternatively if you have configured helm on your cluster, you can add reloader to helm from our public chart repository and deploy it via helm using below mentioned commands +if you have configured helm on your cluster, you can add reloader to helm from public chart repository and deploy it via helm using below mentioned commands ```bash helm repo add stable https://kubernetes-charts.storage.googleapis.com/