[Federation] Convert Daemonset to use the generic sync controller

federation/cmd/federation-controller-manager/app/BUILD

@@ -24,8 +24,6 @@ go_library(
         "//federation/pkg/dnsprovider/providers/google/clouddns:go_default_library",
         "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federation-controller/cluster:go_default_library",
-        "//federation/pkg/federation-controller/configmap:go_default_library",
-        "//federation/pkg/federation-controller/daemonset:go_default_library",
         "//federation/pkg/federation-controller/deployment:go_default_library",
         "//federation/pkg/federation-controller/ingress:go_default_library",
         "//federation/pkg/federation-controller/namespace:go_default_library",

federation/cmd/federation-controller-manager/app/controllermanager.go

@@ -38,8 +38,6 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster"
-	configmapcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/configmap"
-	daemonsetcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/daemonset"
 	deploymentcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/deployment"
 	ingresscontroller "k8s.io/kubernetes/federation/pkg/federation-controller/ingress"
 	namespacecontroller "k8s.io/kubernetes/federation/pkg/federation-controller/namespace"
@@ -166,18 +164,6 @@ func StartControllers(s *options.CMServer, restClientCfg *restclient.Config) err
 		}
 	}
 
-	if controllerEnabled(s.Controllers, serverResources, configmapcontroller.ControllerName, configmapcontroller.RequiredResources, true) {
-		configmapcontrollerClientset := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, "configmap-controller"))
-		configmapcontroller := configmapcontroller.NewConfigMapController(configmapcontrollerClientset)
-		configmapcontroller.Run(wait.NeverStop)
-	}
-
-	if controllerEnabled(s.Controllers, serverResources, daemonsetcontroller.ControllerName, daemonsetcontroller.RequiredResources, true) {
-		daemonsetcontrollerClientset := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, "daemonset-controller"))
-		daemonsetcontroller := daemonsetcontroller.NewDaemonSetController(daemonsetcontrollerClientset)
-		daemonsetcontroller.Run(wait.NeverStop)
-	}
-
 	if controllerEnabled(s.Controllers, serverResources, replicasetcontroller.ControllerName, replicasetcontroller.RequiredResources, true) {
 		replicaSetClientset := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, replicasetcontroller.UserAgentName))
 		replicaSetController := replicasetcontroller.NewReplicaSetController(replicaSetClientset)

federation/pkg/federatedtypes/BUILD

@@ -11,6 +11,8 @@ go_library(
     name = "go_default_library",
     srcs = [
         "adapter.go",
+        "configmap.go",
+        "daemonset.go",
         "registry.go",
         "secret.go",
     ],
@@ -19,6 +21,7 @@ go_library(
         "//federation/client/clientset_generated/federation_clientset:go_default_library",
         "//federation/pkg/federation-controller/util:go_default_library",
         "//pkg/api/v1:go_default_library",
+        "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

federation/pkg/federatedtypes/configmap.go

@@ -0,0 +1,146 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package federatedtypes
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	pkgruntime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/watch"
+	federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
+	"k8s.io/kubernetes/federation/pkg/federation-controller/util"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
+	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+)
+
+const (
+	ConfigMapKind           = "configmap"
+	ConfigMapControllerName = "configmaps"
+)
+
+func init() {
+	RegisterFederatedType(ConfigMapKind, ConfigMapControllerName, []schema.GroupVersionResource{apiv1.SchemeGroupVersion.WithResource(ConfigMapControllerName)}, NewConfigMapAdapter)
+}
+
+type ConfigMapAdapter struct {
+	client federationclientset.Interface
+}
+
+func NewConfigMapAdapter(client federationclientset.Interface) FederatedTypeAdapter {
+	return &ConfigMapAdapter{client: client}
+}
+
+func (a *ConfigMapAdapter) Kind() string {
+	return ConfigMapKind
+}
+
+func (a *ConfigMapAdapter) ObjectType() pkgruntime.Object {
+	return &apiv1.ConfigMap{}
+}
+
+func (a *ConfigMapAdapter) IsExpectedType(obj interface{}) bool {
+	_, ok := obj.(*apiv1.ConfigMap)
+	return ok
+}
+
+func (a *ConfigMapAdapter) Copy(obj pkgruntime.Object) pkgruntime.Object {
+	configmap := obj.(*apiv1.ConfigMap)
+	return &apiv1.ConfigMap{
+		ObjectMeta: util.DeepCopyRelevantObjectMeta(configmap.ObjectMeta),
+		Data:       configmap.Data,
+	}
+}
+
+func (a *ConfigMapAdapter) Equivalent(obj1, obj2 pkgruntime.Object) bool {
+	configmap1 := obj1.(*apiv1.ConfigMap)
+	configmap2 := obj2.(*apiv1.ConfigMap)
+	return util.ConfigMapEquivalent(configmap1, configmap2)
+}
+
+func (a *ConfigMapAdapter) NamespacedName(obj pkgruntime.Object) types.NamespacedName {
+	configmap := obj.(*apiv1.ConfigMap)
+	return types.NamespacedName{Namespace: configmap.Namespace, Name: configmap.Name}
+}
+
+func (a *ConfigMapAdapter) ObjectMeta(obj pkgruntime.Object) *metav1.ObjectMeta {
+	return &obj.(*apiv1.ConfigMap).ObjectMeta
+}
+
+func (a *ConfigMapAdapter) FedCreate(obj pkgruntime.Object) (pkgruntime.Object, error) {
+	configmap := obj.(*apiv1.ConfigMap)
+	return a.client.CoreV1().ConfigMaps(configmap.Namespace).Create(configmap)
+}
+
+func (a *ConfigMapAdapter) FedDelete(namespacedName types.NamespacedName, options *metav1.DeleteOptions) error {
+	return a.client.CoreV1().ConfigMaps(namespacedName.Namespace).Delete(namespacedName.Name, options)
+}
+
+func (a *ConfigMapAdapter) FedGet(namespacedName types.NamespacedName) (pkgruntime.Object, error) {
+	return a.client.CoreV1().ConfigMaps(namespacedName.Namespace).Get(namespacedName.Name, metav1.GetOptions{})
+}
+
+func (a *ConfigMapAdapter) FedList(namespace string, options metav1.ListOptions) (pkgruntime.Object, error) {
+	return a.client.CoreV1().ConfigMaps(namespace).List(options)
+}
+
+func (a *ConfigMapAdapter) FedUpdate(obj pkgruntime.Object) (pkgruntime.Object, error) {
+	configmap := obj.(*apiv1.ConfigMap)
+	return a.client.CoreV1().ConfigMaps(configmap.Namespace).Update(configmap)
+}
+
+func (a *ConfigMapAdapter) FedWatch(namespace string, options metav1.ListOptions) (watch.Interface, error) {
+	return a.client.CoreV1().ConfigMaps(namespace).Watch(options)
+}
+
+func (a *ConfigMapAdapter) ClusterCreate(client kubeclientset.Interface, obj pkgruntime.Object) (pkgruntime.Object, error) {
+	configmap := obj.(*apiv1.ConfigMap)
+	return client.CoreV1().ConfigMaps(configmap.Namespace).Create(configmap)
+}
+
+func (a *ConfigMapAdapter) ClusterDelete(client kubeclientset.Interface, nsName types.NamespacedName, options *metav1.DeleteOptions) error {
+	return client.CoreV1().ConfigMaps(nsName.Namespace).Delete(nsName.Name, options)
+}
+
+func (a *ConfigMapAdapter) ClusterGet(client kubeclientset.Interface, namespacedName types.NamespacedName) (pkgruntime.Object, error) {
+	return client.CoreV1().ConfigMaps(namespacedName.Namespace).Get(namespacedName.Name, metav1.GetOptions{})
+}
+
+func (a *ConfigMapAdapter) ClusterList(client kubeclientset.Interface, namespace string, options metav1.ListOptions) (pkgruntime.Object, error) {
+	return client.CoreV1().ConfigMaps(namespace).List(options)
+}
+
+func (a *ConfigMapAdapter) ClusterUpdate(client kubeclientset.Interface, obj pkgruntime.Object) (pkgruntime.Object, error) {
+	configmap := obj.(*apiv1.ConfigMap)
+	return client.CoreV1().ConfigMaps(configmap.Namespace).Update(configmap)
+}
+
+func (a *ConfigMapAdapter) ClusterWatch(client kubeclientset.Interface, namespace string, options metav1.ListOptions) (watch.Interface, error) {
+	return client.CoreV1().ConfigMaps(namespace).Watch(options)
+}
+
+func (a *ConfigMapAdapter) NewTestObject(namespace string) pkgruntime.Object {
+	return &apiv1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			GenerateName: "test-configmap-",
+			Namespace:    namespace,
+		},
+		Data: map[string]string{
+			"A": "ala ma kota",
+		},
+	}
+}

federation/pkg/federatedtypes/daemonset.go

@@ -0,0 +1,163 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package federatedtypes
+
+import (
+	"reflect"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	pkgruntime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/watch"
+	federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
+	"k8s.io/kubernetes/federation/pkg/federation-controller/util"
+	"k8s.io/kubernetes/pkg/api/v1"
+	extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
+	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+)
+
+const (
+	DaemonSetKind           = "daemonset"
+	DaemonSetControllerName = "daemonsets"
+)
+
+func init() {
+	RegisterFederatedType(DaemonSetKind, DaemonSetControllerName, []schema.GroupVersionResource{extensionsv1.SchemeGroupVersion.WithResource(DaemonSetControllerName)}, NewDaemonSetAdapter)
+}
+
+type DaemonSetAdapter struct {
+	client federationclientset.Interface
+}
+
+func NewDaemonSetAdapter(client federationclientset.Interface) FederatedTypeAdapter {
+	return &DaemonSetAdapter{client: client}
+}
+
+func (a *DaemonSetAdapter) Kind() string {
+	return DaemonSetKind
+}
+
+func (a *DaemonSetAdapter) ObjectType() pkgruntime.Object {
+	return &extensionsv1.DaemonSet{}
+}
+
+func (a *DaemonSetAdapter) IsExpectedType(obj interface{}) bool {
+	_, ok := obj.(*extensionsv1.DaemonSet)
+	return ok
+}
+
+func (a *DaemonSetAdapter) Copy(obj pkgruntime.Object) pkgruntime.Object {
+	daemonset := obj.(*extensionsv1.DaemonSet)
+	return &extensionsv1.DaemonSet{
+		ObjectMeta: util.DeepCopyRelevantObjectMeta(daemonset.ObjectMeta),
+		Spec:       *(util.DeepCopyApiTypeOrPanic(&daemonset.Spec).(*extensionsv1.DaemonSetSpec)),
+	}
+}
+
+func (a *DaemonSetAdapter) Equivalent(obj1, obj2 pkgruntime.Object) bool {
+	daemonset1 := obj1.(*extensionsv1.DaemonSet)
+	daemonset2 := obj2.(*extensionsv1.DaemonSet)
+	return util.ObjectMetaEquivalent(daemonset1.ObjectMeta, daemonset2.ObjectMeta) && reflect.DeepEqual(daemonset1.Spec, daemonset2.Spec)
+}
+
+func (a *DaemonSetAdapter) NamespacedName(obj pkgruntime.Object) types.NamespacedName {
+	daemonset := obj.(*extensionsv1.DaemonSet)
+	return types.NamespacedName{Namespace: daemonset.Namespace, Name: daemonset.Name}
+}
+
+func (a *DaemonSetAdapter) ObjectMeta(obj pkgruntime.Object) *metav1.ObjectMeta {
+	return &obj.(*extensionsv1.DaemonSet).ObjectMeta
+}
+
+func (a *DaemonSetAdapter) FedCreate(obj pkgruntime.Object) (pkgruntime.Object, error) {
+	daemonset := obj.(*extensionsv1.DaemonSet)
+	return a.client.Extensions().DaemonSets(daemonset.Namespace).Create(daemonset)
+}
+
+func (a *DaemonSetAdapter) FedDelete(namespacedName types.NamespacedName, options *metav1.DeleteOptions) error {
+	return a.client.Extensions().DaemonSets(namespacedName.Namespace).Delete(namespacedName.Name, options)
+}
+
+func (a *DaemonSetAdapter) FedGet(namespacedName types.NamespacedName) (pkgruntime.Object, error) {
+	return a.client.Extensions().DaemonSets(namespacedName.Namespace).Get(namespacedName.Name, metav1.GetOptions{})
+}
+
+func (a *DaemonSetAdapter) FedList(namespace string, options metav1.ListOptions) (pkgruntime.Object, error) {
+	return a.client.Extensions().DaemonSets(namespace).List(options)
+}
+
+func (a *DaemonSetAdapter) FedUpdate(obj pkgruntime.Object) (pkgruntime.Object, error) {
+	daemonset := obj.(*extensionsv1.DaemonSet)
+	return a.client.Extensions().DaemonSets(daemonset.Namespace).Update(daemonset)
+}
+
+func (a *DaemonSetAdapter) FedWatch(namespace string, options metav1.ListOptions) (watch.Interface, error) {
+	return a.client.Extensions().DaemonSets(namespace).Watch(options)
+}
+
+func (a *DaemonSetAdapter) ClusterCreate(client kubeclientset.Interface, obj pkgruntime.Object) (pkgruntime.Object, error) {
+	daemonset := obj.(*extensionsv1.DaemonSet)
+	return client.Extensions().DaemonSets(daemonset.Namespace).Create(daemonset)
+}
+
+func (a *DaemonSetAdapter) ClusterDelete(client kubeclientset.Interface, nsName types.NamespacedName, options *metav1.DeleteOptions) error {
+	return client.Extensions().DaemonSets(nsName.Namespace).Delete(nsName.Name, options)
+}
+
+func (a *DaemonSetAdapter) ClusterGet(client kubeclientset.Interface, namespacedName types.NamespacedName) (pkgruntime.Object, error) {
+	return client.Extensions().DaemonSets(namespacedName.Namespace).Get(namespacedName.Name, metav1.GetOptions{})
+}
+
+func (a *DaemonSetAdapter) ClusterList(client kubeclientset.Interface, namespace string, options metav1.ListOptions) (pkgruntime.Object, error) {
+	return client.Extensions().DaemonSets(namespace).List(options)
+}
+
+func (a *DaemonSetAdapter) ClusterUpdate(client kubeclientset.Interface, obj pkgruntime.Object) (pkgruntime.Object, error) {
+	daemonset := obj.(*extensionsv1.DaemonSet)
+	return client.Extensions().DaemonSets(daemonset.Namespace).Update(daemonset)
+}
+
+func (a *DaemonSetAdapter) ClusterWatch(client kubeclientset.Interface, namespace string, options metav1.ListOptions) (watch.Interface, error) {
+	return client.Extensions().DaemonSets(namespace).Watch(options)
+}
+
+func (a *DaemonSetAdapter) NewTestObject(namespace string) pkgruntime.Object {
+	return &extensionsv1.DaemonSet{
+		ObjectMeta: metav1.ObjectMeta{
+			GenerateName: "test-daemonset-",
+			Namespace:    namespace,
+			Labels:       map[string]string{"app": "test-daemonset"},
+		},
+		Spec: extensionsv1.DaemonSetSpec{
+			Template: v1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{"name": "test-pod"},
+				},
+				Spec: v1.PodSpec{
+					Containers: []v1.Container{
+						{
+							Name:  "test-daemonset",
+							Image: "images/test-daemonset",
+							Ports: []v1.ContainerPort{{ContainerPort: 9376}},
+						},
+					},
+				},
+			},
+		},
+	}
+}

federation/pkg/federation-controller/BUILD

@@ -25,8 +25,6 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//federation/pkg/federation-controller/cluster:all-srcs",
-        "//federation/pkg/federation-controller/configmap:all-srcs",
-        "//federation/pkg/federation-controller/daemonset:all-srcs",
         "//federation/pkg/federation-controller/deployment:all-srcs",
         "//federation/pkg/federation-controller/ingress:all-srcs",
         "//federation/pkg/federation-controller/namespace:all-srcs",