From 3e6c4a3f609492f8f9eef277f90c6503b1e76821 Mon Sep 17 00:00:00 2001 From: hstanley Date: Wed, 3 Jul 2019 16:01:15 +0100 Subject: [PATCH] Switch from list of resources to monitor to list of resources to ignore --- .../chart/reloader/templates/clusterrole.yaml | 4 ++-- .../chart/reloader/templates/deployment.yaml | 8 ++++---- .../kubernetes/chart/reloader/templates/role.yaml | 8 ++++---- deployments/kubernetes/chart/reloader/values.yaml | 4 ++-- .../kubernetes/templates/chart/values.yaml.tmpl | 4 ++-- internal/pkg/cmd/reloader.go | 12 ++++++------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml index 78206b4b..8075763e 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml @@ -16,10 +16,10 @@ rules: - apiGroups: - "" resources: -{{- if eq .Values.reloader.watchSecrets true }} +{{- if .Values.reloader.ignoreSecrets }}{{- else }} - secrets {{- end }} -{{- if eq .Values.reloader.watchConfigMaps true }} +{{- if .Values.reloader.ignoreConfigMaps }}{{- else }} - configmaps {{- end }} verbs: diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index f75e61fc..3ccf44f1 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -93,11 +93,11 @@ spec: - "--auto-annotation" - "{{ .Values.reloader.custom_annotations.auto }}" {{- end }} - {{- if eq .Values.reloader.watchSecrets true }} - - "--resources-to-watch=secrets" + {{- if eq .Values.reloader.ignoreSecrets true }} + - "--resources-to-ignore=secrets" {{- end }} - {{- if eq .Values.reloader.watchConfigMaps true }} - - "--resources-to-watch=configMaps" + {{- if eq .Values.reloader.ignoreConfigMaps true }} + - "--resources-to-ignore=configMaps" {{- end }} {{- end }} serviceAccountName: {{ template "reloader-serviceAccountName" . }} diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml index e421c3dc..90a348f6 100644 --- a/deployments/kubernetes/chart/reloader/templates/role.yaml +++ b/deployments/kubernetes/chart/reloader/templates/role.yaml @@ -16,12 +16,12 @@ rules: - apiGroups: - "" resources: - {{- if .Values.reloader.watchSecrets }} +{{- if .Values.reloader.ignoreSecrets }}{{- else }} - secrets - {{- end }} - {{- if .Values.reloader.watchConfigMaps }} +{{- end }} +{{- if .Values.reloader.ignoreConfigMaps }}{{- else }} - configmaps - {{- end }} +{{- end }} verbs: - list - get diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index e593b5ad..7df3dcf7 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -4,8 +4,8 @@ kubernetes: host: https://kubernetes.default reloader: - watchSecrets: true - watchConfigMaps: true + ignoreSecrets: false + ignoreConfigMaps: false watchGlobally: true # Set to true if you have a pod security policy that enforces readOnlyRootFilesystem readOnlyRootFileSystem: false diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index 6b43edb6..06b857b3 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -4,8 +4,8 @@ kubernetes: host: https://kubernetes.default reloader: - watchSecrets: true - watchConfigMaps: true + ignoreSecrets: false + ignoreConfigMaps: false watchGlobally: true # Set to true if you have a pod security policy that enforces readOnlyRootFilesystem readOnlyRootFileSystem: false diff --git a/internal/pkg/cmd/reloader.go b/internal/pkg/cmd/reloader.go index 7fbb9047..98aa6b67 100644 --- a/internal/pkg/cmd/reloader.go +++ b/internal/pkg/cmd/reloader.go @@ -24,13 +24,13 @@ func NewReloaderCommand() *cobra.Command { cmd.PersistentFlags().StringVar(&options.ConfigmapUpdateOnChangeAnnotation, "configmap-annotation", "configmap.reloader.stakater.com/reload", "annotation to detect changes in configmaps") cmd.PersistentFlags().StringVar(&options.SecretUpdateOnChangeAnnotation, "secret-annotation", "secret.reloader.stakater.com/reload", "annotation to detect changes in secrets") cmd.PersistentFlags().StringVar(&options.ReloaderAutoAnnotation, "auto-annotation", "reloader.stakater.com/auto", "annotation to detect changes in secrets") - cmd.PersistentFlags().StringSlice("resources-to-watch", []string{"configMaps", "secrets"}, "list of resources to watch (valid options 'configMaps', 'secrets')") + cmd.PersistentFlags().StringSlice("resources-to-ignore", []string{}, "list of resources to ignore (valid options 'configMaps', 'secrets')") return cmd } func startReloader(cmd *cobra.Command, args []string) { - var watchList util.List + var ignoreList util.List var err error logrus.Info("Starting Reloader") @@ -46,19 +46,19 @@ func startReloader(cmd *cobra.Command, args []string) { logrus.Fatal(err) } - watchList, err = cmd.Flags().GetStringSlice("resources-to-watch") + ignoreList, err = cmd.Flags().GetStringSlice("resources-to-ignore") if err != nil { logrus.Fatal(err) } - for _, v := range watchList { + for _, v := range ignoreList { if v != "configMaps" && v != "secrets" { - logrus.Fatalf("'resources-to-watch' only accepts 'configMaps' and 'secrets', not '%s'", v) + logrus.Fatalf("'resources-to-ignore' only accepts 'configMaps' or 'secrets', not '%s'", v) } } for k := range kube.ResourceMap { - if !watchList.Contains(k) { + if ignoreList.Contains(k) { continue }