github/Reloader
1
0
Fork 0
mirror of https://github.com/stakater/Reloader.git synced 2026-02-14 18:09:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
waseem
2019-07-05 12:24:46 +02:00
parent 878bc5c442 e7ccc40035
commit 16d75d1d47
13 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deployments/kubernetes/chart/reloader/Chart.yaml
View File

@@ -3,8 +3,8 @@
apiVersion: v1
name: reloader
description: Reloader chart that runs on kubernetes
version: v0.0.34
appVersion: v0.0.34
version: v0.0.35
appVersion: v0.0.35
keywords:
- Reloader
- kubernetes

4
deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
View File

@@ -16,8 +16,12 @@ rules:
- apiGroups:
- ""
resources:
{{- if .Values.reloader.ignoreSecrets }}{{- else }}
- secrets
{{- end }}
{{- if .Values.reloader.ignoreConfigMaps }}{{- else }}
- configmaps
{{- end }}
verbs:
- list
- get

6
deployments/kubernetes/chart/reloader/templates/deployment.yaml
View File

@@ -101,6 +101,12 @@ spec:
- "--auto-annotation"
- "{{ .Values.reloader.custom_annotations.auto }}"
{{- end }}
{{- if eq .Values.reloader.ignoreSecrets true }}
- "--resources-to-ignore=secrets"
{{- end }}
{{- if eq .Values.reloader.ignoreConfigMaps true }}
- "--resources-to-ignore=configMaps"
{{- end }}
{{- end }}
{{- if .Values.reloader.deployment.resources }}
resources:

4
deployments/kubernetes/chart/reloader/templates/role.yaml
View File

@@ -16,8 +16,12 @@ rules:
- apiGroups:
- ""
resources:
{{- if .Values.reloader.ignoreSecrets }}{{- else }}
- secrets
{{- end }}
{{- if .Values.reloader.ignoreConfigMaps }}{{- else }}
- configmaps
{{- end }}
verbs:
- list
- get

6
deployments/kubernetes/chart/reloader/values.yaml
View File

@@ -4,6 +4,8 @@ kubernetes:
host: https://kubernetes.default
reloader:
ignoreSecrets: false
ignoreConfigMaps: false
watchGlobally: true
# Set to true if you have a pod security policy that enforces readOnlyRootFilesystem
readOnlyRootFileSystem: false
@@ -35,10 +37,10 @@ reloader:
labels:
provider: stakater
group: com.stakater.platform
version: v0.0.34
version: v0.0.35
image:
name: stakater/reloader
tag: "v0.0.34"
tag: "v0.0.35"
pullPolicy: IfNotPresent
# Support for extra environment variables.
env:

2
deployments/kubernetes/manifests/clusterrole.yaml
View File

@@ -6,7 +6,7 @@ kind: ClusterRole
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
name: reloader-role

2
deployments/kubernetes/manifests/clusterrolebinding.yaml
View File

@@ -6,7 +6,7 @@ kind: ClusterRoleBinding
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
name: reloader-role-binding

10
deployments/kubernetes/manifests/deployment.yaml
View File

@@ -5,12 +5,12 @@ kind: Deployment
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
group: com.stakater.platform
provider: stakater
version: v0.0.34
version: v0.0.35
name: reloader
spec:
@@ -24,17 +24,17 @@ spec:
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
group: com.stakater.platform
provider: stakater
version: v0.0.34
version: v0.0.35
spec:
containers:
- env:
image: "stakater/reloader:v0.0.34"
image: "stakater/reloader:v0.0.35"
imagePullPolicy: IfNotPresent
name: reloader
serviceAccountName: reloader

2
deployments/kubernetes/manifests/serviceaccount.yaml
View File

@@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
name: reloader

16
deployments/kubernetes/reloader.yaml
View File

@@ -9,12 +9,12 @@ kind: Deployment
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
group: com.stakater.platform
provider: stakater
version: v0.0.34
version: v0.0.35
name: reloader
spec:
@@ -28,17 +28,17 @@ spec:
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
group: com.stakater.platform
provider: stakater
version: v0.0.34
version: v0.0.35
spec:
containers:
- env:
image: "stakater/reloader:v0.0.34"
image: "stakater/reloader:v0.0.35"
imagePullPolicy: IfNotPresent
name: reloader
serviceAccountName: reloader
@@ -51,7 +51,7 @@ kind: ClusterRole
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
name: reloader-role
@@ -100,7 +100,7 @@ kind: ClusterRoleBinding
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
name: reloader-role-binding
@@ -122,7 +122,7 @@ kind: ServiceAccount
metadata:
labels:
app: reloader
chart: "reloader-v0.0.34"
chart: "reloader-v0.0.35"
release: "RELEASE-NAME"
heritage: "Tiller"
name: reloader

2
deployments/kubernetes/templates/chart/values.yaml.tmpl
View File

@@ -4,6 +4,8 @@ kubernetes:
host: https://kubernetes.default
reloader:
ignoreSecrets: false
ignoreConfigMaps: false
watchGlobally: true
# Set to true if you have a pod security policy that enforces readOnlyRootFilesystem
readOnlyRootFileSystem: false

24
internal/pkg/cmd/reloader.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/stakater/Reloader/internal/pkg/controller"
"github.com/stakater/Reloader/internal/pkg/options"
"github.com/stakater/Reloader/internal/pkg/util"
"github.com/stakater/Reloader/pkg/kube"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@@ -23,11 +24,15 @@ 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-ignore", []string{}, "list of resources to ignore (valid options 'configMaps' or 'secrets')")
return cmd
}
func startReloader(cmd *cobra.Command, args []string) {
var ignoreList util.List
var err error
logrus.Info("Starting Reloader")
currentNamespace := os.Getenv("KUBERNETES_NAMESPACE")
if len(currentNamespace) == 0 {
@@ -41,7 +46,26 @@ func startReloader(cmd *cobra.Command, args []string) {
logrus.Fatal(err)
}
ignoreList, err = cmd.Flags().GetStringSlice("resources-to-ignore")
if err != nil {
logrus.Fatal(err)
}
for _, v := range ignoreList {
if v != "configMaps" && v != "secrets" {
logrus.Fatalf("'resources-to-ignore' only accepts 'configMaps' or 'secrets', not '%s'", v)
}
}
if len(ignoreList) > 1 {
logrus.Fatal("'resources-to-ignore' only accepts 'configMaps' or 'secrets', not both")
}
for k := range kube.ResourceMap {
if ignoreList.Contains(k) {
continue
}
c, err := controller.NewController(clientset, k, currentNamespace)
if err != nil {
logrus.Fatalf("%s", err)

11
internal/pkg/util/util.go
View File

@@ -46,3 +46,14 @@ func GetSHAfromSecret(data map[string][]byte) string {
sort.Strings(values)
return crypto.GenerateSHA(strings.Join(values, ";"))
}
type List []string
func (l *List) Contains(s string) bool {
for _, v := range *l {
if v == s {
return true
}
}
return false
}