[stable/reloader] Fix multiple small issues (#16313)

* [stable/reloader] Fix multiple small issues

- Added nodeSelector for deployment
- Fixed `README` to properly indicate that all values are coming from the `reloader` section
- Fixed service account name to fallback to the chart fullname for the name uniformity of deployed resources when not explicitly set
- Fixed role and role binding to use the chart fullname for the name uniformity of deployed resources

Signed-off-by: Romeo Dumitrescu <winromulus@users.noreply.github.com>

* Fix cluster role binding name

Signed-off-by: Romeo Dumitrescu <winromulus@users.noreply.github.com>
This commit is contained in:
Romeo Dumitrescu
2019-08-19 03:29:29 -07:00
committed by Kubernetes Prow Robot
parent e13bb2a7e9
commit 13c8cd9950
6 changed files with 27 additions and 21 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: reloader
description: Reloader chart that runs on kubernetes
version: 1.1.1
version: 1.1.2
appVersion: "v0.0.29"
keywords:
- Reloader
+16 -15
View File
@@ -74,21 +74,22 @@ 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 | `v0.0.29` | `v0.0.29` |
| 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` |
| custom_annotations | Optional flags to pass to the Reloader entrypoint | `{}` | `{}` |
| reloader.watchGlobally | Option to watch configmap and secrets in all namespaces | `true` | `true` |
| reloader.matchLabels | Additional match Labels for selector | `{}` | `{}` |
| reloader.deployment.annotations | Annotations for deployment | `{}` | `{}` |
| reloader.deployment.labels | Labels for deployment | `provider` | `provider` |
| reloader.deployment.image.name | Image name for reloader | `stakater/reloader` | `stakater/reloader` |
| reloader.deployment.image.tag | Image tag for reloader | `v0.0.29` | `v0.0.29` |
| reloader.deployment.image.pullPolicy | Image pull policy for reloader | `IfNotPresent` | `IfNotPresent` |
| reloader.deployment.env.open | Additional key value pair as environment variables | `STORAGE: local` | `` |
| reloader.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` | `` |
| reloader.deployment.env.field | Additional environment variables to expose pod information to containers. | `POD_IP: status.podIP` | `` |
| reloader.rbac.enabled | Option to create rbac | `true` | `true` |
| reloader.rbac.labels | Additional labels for rbac | `{}` | `{}` |
| reloader.serviceAccount.create | Option to create serviceAccount | `true` | `true` |
| reloader.serviceAccount.name | Name of serviceAccount | `reloader` | `reloader` |
| reloader.custom_annotations | Optional flags to pass to the Reloader entrypoint | `{}` | `{}` |
| reloader.nodeSelector | Optional node labels for pod assignment | `{}` | `{}` |
## Deploying to Kubernetes
You can deploy Reloader by following methods:
+5 -1
View File
@@ -14,7 +14,7 @@ metadata:
{{- if .Values.reloader.matchLabels }}
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
{{- end }}
name: {{ template "reloader-name" . }}
name: {{ template "reloader-fullname" . }}
namespace: {{ .Release.Namespace }}
spec:
replicas: 1
@@ -88,3 +88,7 @@ spec:
{{- end }}
{{- end }}
serviceAccountName: {{ template "serviceAccountName" . }}
{{- if .Values.reloader.nodeSelector }}
nodeSelector:
{{ toYaml .Values.reloader.nodeSelector | indent 8 }}
{{- end }}
+1 -1
View File
@@ -11,7 +11,7 @@ metadata:
{{- if .Values.reloader.matchLabels }}
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
{{- end }}
name: {{ template "reloader-name" . }}-role
name: {{ template "reloader-fullname" . }}-role
namespace: {{ .Release.Namespace }}
rules:
- apiGroups:
+2 -2
View File
@@ -12,12 +12,12 @@ metadata:
{{- if .Values.reloader.matchLabels }}
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
{{- end }}
name: {{ template "reloader-name" . }}-role-binding
name: {{ template "reloader-fullname" . }}-role-binding
namespace: {{ .Release.Namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: {{ template "reloader-name" . }}-role
name: {{ template "reloader-fullname" . }}-role
subjects:
- kind: ServiceAccount
name: {{ template "serviceAccountName" . }}
+2 -1
View File
@@ -28,10 +28,11 @@ 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: reloader
name:
# Optional flags to pass to the Reloader entrypoint
# Example:
# custom_annotations:
# configmap: "my.company.com/configmap"
# secret: "my.company.com/secret"
custom_annotations: {}
nodeSelector: {}