Bump Version to v0.0.28

Initial implementation of fix for issue 61

.version

@@ -1 +1 @@
-v0.0.27
+v0.0.28

README.md

@@ -96,7 +96,8 @@ spec:
 
 ### NOTES
 - Reloader also supports [sealed-secrets](https://github.com/bitnami-labs/sealed-secrets). [Here](docs/Reloader-with-Sealed-Secrets.md) are the steps to use sealed-secrets with reloader.
-- `reloader.stakater.com/auto: "true"` will always override when use with either `secret.reloader.stakater.com/reload` or `configmap.reloader.stakater.com/reload` annotation.
+- `reloader.stakater.com/auto: "true"` will only reload the pod, if the configmap or secret is used (as a volume mount or as an env) in `Deployment/Daemonsets/Statefulsets`
+- `secret.reloader.stakater.com/reload` or `configmap.reloader.stakater.com/reload` annotation will reload the pod upon changes in specified configmap or secret, irrespective of the usage of configmap or secret.
 - you may override the auto annotation with the `--auto-annotation` flag
 - you may override the configmap annotation with the `--configmap-annotation` flag
 - you may override the secret annotation with the `--secret-annotation` flag

deployments/kubernetes/chart/reloader/Chart.yaml

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

deployments/kubernetes/chart/reloader/values.yaml

@@ -11,10 +11,10 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v0.0.27
+      version: v0.0.28
     image:
       name: stakater/reloader
-      tag: "v0.0.27"
+      tag: "v0.0.28"
       pullPolicy: IfNotPresent
     # Support for extra environment variables.
     env:

deployments/kubernetes/manifests/clusterrole.yaml

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

deployments/kubernetes/manifests/clusterrolebinding.yaml

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

deployments/kubernetes/manifests/deployment.yaml

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

deployments/kubernetes/manifests/serviceaccount.yaml

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

deployments/kubernetes/reloader.yaml

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

internal/pkg/handler/upgrade.go

@@ -79,18 +79,21 @@ func PerformRollingUpgrade(client kubernetes.Interface, config util.Config, upgr
 		result := constants.NotUpdated
 		reloaderEnabled, err := strconv.ParseBool(reloaderEnabledValue)
 		if err == nil && reloaderEnabled {
-			result = updateContainers(upgradeFuncs, i, config)
-		} else if annotationValue != "" {
+			result = updateContainers(upgradeFuncs, i, config, true)
+		}
+
+		if result != constants.Updated && annotationValue != "" {
 			values := strings.Split(annotationValue, ",")
 			for _, value := range values {
 				if value == config.ResourceName {
-					result = updateContainers(upgradeFuncs, i, config)
+					result = updateContainers(upgradeFuncs, i, config, false)
 					if result == constants.Updated {
 						break
 					}
 				}
 			}
 		}
+
 		if result == constants.Updated {
 			err = upgradeFuncs.UpdateFunc(client, config.Namespace, i)
 			resourceName := util.ToObjectMeta(i).Name
@@ -155,7 +158,7 @@ func getContainerWithEnvReference(containers []v1.Container, resourceName string
 	return nil
 }
 
-func getContainerToUpdate(upgradeFuncs callbacks.RollingUpgradeFuncs, item interface{}, config util.Config) *v1.Container {
+func getContainerToUpdate(upgradeFuncs callbacks.RollingUpgradeFuncs, item interface{}, config util.Config, autoReload bool) *v1.Container {
 	volumes := upgradeFuncs.VolumesFunc(item)
 	containers := upgradeFuncs.ContainersFunc(item)
 	initContainers := upgradeFuncs.InitContainersFunc(item)
@@ -185,13 +188,19 @@ func getContainerToUpdate(upgradeFuncs callbacks.RollingUpgradeFuncs, item inter
 			return &containers[0]
 		}
 	}
+
+	// Get the first container if the annotation is related to specified configmap or secret i.e. configmap.reloader.stakater.com/reload
+	if container == nil && !autoReload {
+		return &containers[0]
+	}
+
 	return container
 }
 
-func updateContainers(upgradeFuncs callbacks.RollingUpgradeFuncs, item interface{}, config util.Config) constants.Result {
+func updateContainers(upgradeFuncs callbacks.RollingUpgradeFuncs, item interface{}, config util.Config, autoReload bool) constants.Result {
 	var result constants.Result
 	envar := constants.EnvVarPrefix + util.ConvertToEnvVarName(config.ResourceName) + "_" + config.Type
-	container := getContainerToUpdate(upgradeFuncs, item, config)
+	container := getContainerToUpdate(upgradeFuncs, item, config, autoReload)
 
 	if container == nil {
 		return constants.NoContainerFound