Merge branch 'stakater:master' into fix/configmaps-resources-to-ignore-mismatch

Author: yvjessestephens

README.md

@@ -440,6 +440,7 @@ These flags allow you to redefine annotation keys used in your workloads or reso
 | `--search-match-annotation` | Overrides `reloader.stakater.com/match` |
 | `--secret-annotation` | Overrides `secret.reloader.stakater.com/reload` |
 | `--configmap-annotation` | Overrides `configmap.reloader.stakater.com/reload` |
+| `--ignore-annotation` | Overrides `reloader.stakater.com/ignore` |
 | `--pause-deployment-annotation` | Overrides `deployment.reloader.stakater.com/pause-period` |
 | `--pause-deployment-time-annotation` | Overrides `deployment.reloader.stakater.com/paused-at` |
 

deployments/kubernetes/chart/reloader/README.md

@@ -75,6 +75,7 @@ helm uninstall {{RELEASE_NAME}} -n {{NAMESPACE}}
 | ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | ----------------- |
 | `reloader.deployment.replicas`                  | Number of replicas, if you wish to run multiple replicas set `reloader.enableHA = true`. The replicas will be limited to 1 when `reloader.enableHA = false` | int    | 1                 |
 | `reloader.deployment.revisionHistoryLimit`      | Limit the number of revisions retained in the revision history                                                                                              | int    | 2                 |
+| `reloader.deployment.hostUsers`                 | Enable user namespace                                                                                                       | boolean    |               |
 | `reloader.deployment.nodeSelector`              | Scheduling pod to a specific node based on set labels                                                                                                       | map    | `{}`              |
 | `reloader.deployment.affinity`                  | Set affinity rules on pod                                                                                                                                   | map    | `{}`              |
 | `reloader.deployment.securityContext`           | Set pod security context                                                                                                                                    | map    | `{}`              |

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -47,6 +47,9 @@ spec:
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
 {{ include "reloader-imagePullSecrets" . | indent 8 }}
+      {{- end }}
+      {{- if kindIs "bool" .Values.reloader.deployment.hostUsers }}
+      hostUsers: {{ .Values.reloader.deployment.hostUsers }}
       {{- end }}
       {{- if .Values.reloader.deployment.nodeSelector }}
       nodeSelector:
@@ -277,6 +280,10 @@ spec:
             {{- if .Values.reloader.custom_annotations.match }}
           - "--search-match-annotation"
           - "{{ .Values.reloader.custom_annotations.match }}"
+            {{- end }}
+            {{- if .Values.reloader.custom_annotations.ignore }}
+          - "--ignore-annotation"
+          - "{{ .Values.reloader.custom_annotations.ignore }}"
             {{- end }}
             {{- if .Values.reloader.custom_annotations.pausePeriod }}
           - "--pause-deployment-annotation"

deployments/kubernetes/chart/reloader/values.yaml

@@ -78,6 +78,8 @@ reloader:
 
     revisionHistoryLimit: 2
 
+    hostUsers: null
+
     nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
 
@@ -213,6 +215,7 @@ reloader:
   #   custom_annotations:
   #     configmap: "my.company.com/configmap"
   #     secret: "my.company.com/secret"
+  #     ignore: "my.company.com/reloader-ignore"
   custom_annotations: {}
 
   serviceMonitor:

internal/pkg/util/util.go

@@ -84,6 +84,7 @@ func ConfigureReloaderFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().StringVar(&options.ConfigmapUpdateOnChangeAnnotation, "configmap-annotation", "configmap.reloader.stakater.com/reload", "annotation to detect changes in configmaps, specified by name")
 	cmd.PersistentFlags().StringVar(&options.SecretUpdateOnChangeAnnotation, "secret-annotation", "secret.reloader.stakater.com/reload", "annotation to detect changes in secrets, specified by name")
 	cmd.PersistentFlags().StringVar(&options.ReloaderAutoAnnotation, "auto-annotation", "reloader.stakater.com/auto", "annotation to detect changes in secrets/configmaps")
+	cmd.PersistentFlags().StringVar(&options.IgnoreResourceAnnotation, "ignore-annotation", "reloader.stakater.com/ignore", "annotation to ignore a resource when watching for changes in secrets/configmaps")
 	cmd.PersistentFlags().StringVar(&options.ConfigmapReloaderAutoAnnotation, "configmap-auto-annotation", "configmap.reloader.stakater.com/auto", "annotation to detect changes in configmaps")
 	cmd.PersistentFlags().StringVar(&options.SecretReloaderAutoAnnotation, "secret-auto-annotation", "secret.reloader.stakater.com/auto", "annotation to detect changes in secrets")
 	cmd.PersistentFlags().StringVar(&options.AutoSearchAnnotation, "auto-search-annotation", "reloader.stakater.com/search", "annotation to detect changes in configmaps or secrets tagged with special match annotation")