Adding support for Secrets

.gitignore

@@ -1,5 +1,4 @@
 *.swp
-bin/
 _dist/
 .idea
 golib

Dockerfile

@@ -2,4 +2,5 @@ FROM scratch
 
 ENTRYPOINT ["/configmapcontroller"]
 
+COPY bin/kubectl /kubectl
 COPY ./build/configmapcontroller-linux-amd64 /configmapcontroller

README.md

@@ -1,23 +1,28 @@
 # configmapcontroller
 
-This controller watches for changes to `ConfigMap` objects and performs rolling upgrades on their associated deployments for apps which are not capable of watching the `ConfigMap` and updating dynamically.  
+This controller watches for changes to `ConfigMap` or `Secret` objects and performs rolling upgrades on their associated deployments,daemonsets or statefulsets  for apps which are not capable of watching the `ConfigMap` and updating dynamically.  
 
-This is particularly useful if the `ConfigMap` is used to define environment variables - or your app cannot easily and reliably watch the `ConfigMap` and update itself on the fly. 
+This is particularly useful if the `ConfigMap` or `Secret` is used to define environment variables - or your app cannot easily and reliably watch the `ConfigMap` and update itself on the fly. 
 
 ## How to use configmapcontroller
 
-For a `Deployment` called `foo` have a `ConfigMap` called `foo`. Then add this annotation to your `Deployment`
+For an object(DaemonSet, Deployment, StatefulSet)  called `foo` have a `ConfigMap` called `foo`. Then add this annotation to your manifest:
 
 ```yaml
 metadata:
   annotations:
     configmap.fabric8.io/update-on-change: "foo"
 ```
 
-Then, providing `configmapcontroller` is running, whenever you edit the `ConfigMap` called `foo` the configmapcontroller will update the `Deployment` by adding the environment variable:
+For configmaps use the annotation configmap.frabric8.io/update-on-change.
+
+For secrets use the annotation secret.fabric8.io/update-on-change.
+
+Then, providing `configmapcontroller` is running, whenever you edit the `ConfigMap` called `foo` the configmapcontroller will update the `Deployment`, `StatefulSet` or `DaemonSet` by labeling it and hence triggering a rolling update on the object provided that .spec.updateStrategy.type is set to `RollingUpdate`. 
+
+The label would be
 
 ```
 FABRICB_FOO_REVISION=${configMapRevision}
 ```
 
-This then triggers a rolling upgrade of your deployment's pods to use the new configuration.

configmapcontroller.go

@@ -10,12 +10,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/fabric8io/configmapcontroller/client"
 	"github.com/fabric8io/configmapcontroller/controller"
-	"github.com/fabric8io/configmapcontroller/util"
 	"github.com/fabric8io/configmapcontroller/version"
 	"github.com/golang/glog"
-	oclient "github.com/openshift/origin/pkg/client"
 	"github.com/spf13/pflag"
 	"k8s.io/kubernetes/pkg/api"
 	kubectlutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -55,27 +52,14 @@ func main() {
 		glog.Fatalf("failed to create REST client config: %s", err)
 	}
 
-	var oc *oclient.Client
-	typeOfMaster, err := util.TypeOfMaster(kubeClient)
-	if err != nil {
-		glog.Fatalf("failed to create REST client config: %s", err)
-	}
-	if typeOfMaster == util.OpenShift {
-		oc, _, err = client.NewOpenShiftClient(restClientConfig)
-		if err != nil {
-			glog.Fatalf("failed to create REST client config: %s", err)
-		}
-	}
-
 	watchNamespaces := api.NamespaceAll
 	currentNamespace := os.Getenv("KUBERNETES_NAMESPACE")
 	if len(currentNamespace) > 0 {
 		watchNamespaces = currentNamespace
 	}
 	glog.Infof("Watching services in namespaces: `%s`", watchNamespaces)
 
-
-	c, err := controller.NewController(kubeClient, oc, restClientConfig, factory.JSONEncoder(), *resyncPeriod, watchNamespaces)
+	c, err := controller.NewController(kubeClient, restClientConfig, factory.JSONEncoder(), *resyncPeriod, watchNamespaces)
 	if err != nil {
 		glog.Fatalf("%s", err)
 	}