Merge pull request #435 from galal-hussein/svclb_upgrade

pkg/servicelb/controller.go

@@ -42,15 +42,17 @@ func Register(ctx context.Context, kubernetes kubernetes.Interface, enabled, roo
 	appClients := appclient.ClientsFrom(ctx)
 
 	h := &handler{
-		rootless:  rootless,
-		enabled:   enabled,
-		nodeCache: clients.Node.Cache(),
-		podCache:  clients.Pod.Cache(),
+		rootless:        rootless,
+		enabled:         enabled,
+		nodeCache:       clients.Node.Cache(),
+		podCache:        clients.Pod.Cache(),
+		deploymentCache: appClients.Deployment.Cache(),
 		processor: objectset.NewProcessor("svccontroller").
 			Client(appClients.DaemonSet),
 		serviceCache: clients.Service.Cache(),
 		services:     kubernetes.CoreV1(),
 		daemonsets:   kubernetes.AppsV1(),
+		deployments:  kubernetes.AppsV1(),
 	}
 
 	clients.Service.OnChange(ctx, "svccontroller", h.onChangeService)
@@ -65,14 +67,16 @@ func Register(ctx context.Context, kubernetes kubernetes.Interface, enabled, roo
 }
 
 type handler struct {
-	rootless     bool
-	enabled      bool
-	nodeCache    coreclient.NodeClientCache
-	podCache     coreclient.PodClientCache
-	processor    *objectset.Processor
-	serviceCache coreclient.ServiceClientCache
-	services     coregetter.ServicesGetter
-	daemonsets   v1getter.DaemonSetsGetter
+	rootless        bool
+	enabled         bool
+	nodeCache       coreclient.NodeClientCache
+	podCache        coreclient.PodClientCache
+	deploymentCache appclient.DeploymentClientCache
+	processor       *objectset.Processor
+	serviceCache    coreclient.ServiceClientCache
+	services        coregetter.ServicesGetter
+	daemonsets      v1getter.DaemonSetsGetter
+	deployments     v1getter.DeploymentsGetter
 }
 
 func (h *handler) onResourceChange(name, namespace string, obj runtime.Object) ([]changeset.Key, error) {
@@ -218,7 +222,9 @@ func (h *handler) podIPs(pods []*core.Pod) ([]string, error) {
 }
 
 func (h *handler) deployPod(svc *core.Service) error {
-
+	if err := h.deleteOldDeployments(svc); err != nil {
+		return err
+	}
 	objs := objectset.NewObjectSet()
 	if !h.enabled {
 		return h.processor.NewDesiredSet(svc, objs).Apply()
@@ -363,3 +369,14 @@ func (h *handler) updateDaemonSets() error {
 
 	return nil
 }
+
+func (h *handler) deleteOldDeployments(svc *core.Service) error {
+	name := fmt.Sprintf("svclb-%s", svc.Name)
+	if _, err := h.deploymentCache.Get(svc.Namespace, name); err != nil {
+		if errors.IsNotFound(err) {
+			return nil
+		}
+		return err
+	}
+	return h.deployments.Deployments(svc.Namespace).Delete(name, &meta.DeleteOptions{})
+}

types/apis/apps/v1/zz_generated_deepcopy.go

@@ -37,3 +37,36 @@ func (in *DaemonSetList) DeepCopyObject() runtime.Object {
 	}
 	return nil
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DeploymentList) DeepCopyInto(out *DeploymentList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	out.ListMeta = in.ListMeta
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]appsv1.Deployment, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeploymentList.
+func (in *DeploymentList) DeepCopy() *DeploymentList {
+	if in == nil {
+		return nil
+	}
+	out := new(DeploymentList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *DeploymentList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}

types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go

+package v1
+
+import (
+	"github.com/rancher/norman/lifecycle"
+	v1 "k8s.io/api/apps/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+type DeploymentLifecycle interface {
+	Create(obj *v1.Deployment) (runtime.Object, error)
+	Remove(obj *v1.Deployment) (runtime.Object, error)
+	Updated(obj *v1.Deployment) (runtime.Object, error)
+}
+
+type deploymentLifecycleAdapter struct {
+	lifecycle DeploymentLifecycle
+}
+
+func (w *deploymentLifecycleAdapter) HasCreate() bool {
+	o, ok := w.lifecycle.(lifecycle.ObjectLifecycleCondition)
+	return !ok || o.HasCreate()
+}
+
+func (w *deploymentLifecycleAdapter) HasFinalize() bool {
+	o, ok := w.lifecycle.(lifecycle.ObjectLifecycleCondition)
+	return !ok || o.HasFinalize()
+}
+
+func (w *deploymentLifecycleAdapter) Create(obj runtime.Object) (runtime.Object, error) {
+	o, err := w.lifecycle.Create(obj.(*v1.Deployment))
+	if o == nil {
+		return nil, err
+	}
+	return o, err
+}
+
+func (w *deploymentLifecycleAdapter) Finalize(obj runtime.Object) (runtime.Object, error) {
+	o, err := w.lifecycle.Remove(obj.(*v1.Deployment))
+	if o == nil {
+		return nil, err
+	}
+	return o, err
+}
+
+func (w *deploymentLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error) {
+	o, err := w.lifecycle.Updated(obj.(*v1.Deployment))
+	if o == nil {
+		return nil, err
+	}
+	return o, err
+}
+
+func NewDeploymentLifecycleAdapter(name string, clusterScoped bool, client DeploymentInterface, l DeploymentLifecycle) DeploymentHandlerFunc {
+	adapter := &deploymentLifecycleAdapter{lifecycle: l}
+	syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient())
+	return func(key string, obj *v1.Deployment) (runtime.Object, error) {
+		newObj, err := syncFn(key, obj)
+		if o, ok := newObj.(runtime.Object); ok {
+			return o, err
+		}
+		return nil, err
+	}
+}

types/apis/apps/v1/zz_generated_k8s_client.go

@@ -21,12 +21,14 @@ type Interface interface {
 	controller.Starter
 
 	DaemonSetsGetter
+	DeploymentsGetter
 }
 
 type Clients struct {
 	Interface Interface
 
-	DaemonSet DaemonSetClient
+	DaemonSet  DaemonSetClient
+	Deployment DeploymentClient
 }
 
 type Client struct {
@@ -34,7 +36,8 @@ type Client struct {
 	restClient rest.Interface
 	starters   []controller.Starter
 
-	daemonSetControllers map[string]DaemonSetController
+	daemonSetControllers  map[string]DaemonSetController
+	deploymentControllers map[string]DeploymentController
 }
 
 func Factory(ctx context.Context, config rest.Config) (context.Context, controller.Starter, error) {
@@ -73,6 +76,9 @@ func NewClientsFromInterface(iface Interface) *Clients {
 		DaemonSet: &daemonSetClient2{
 			iface: iface.DaemonSets(""),
 		},
+		Deployment: &deploymentClient2{
+			iface: iface.Deployments(""),
+		},
 	}
 }
 
@@ -89,7 +95,8 @@ func NewForConfig(config rest.Config) (Interface, error) {
 	return &Client{
 		restClient: restClient,
 
-		daemonSetControllers: map[string]DaemonSetController{},
+		daemonSetControllers:  map[string]DaemonSetController{},
+		deploymentControllers: map[string]DeploymentController{},
 	}, nil
 }
 
@@ -117,3 +124,16 @@ func (c *Client) DaemonSets(namespace string) DaemonSetInterface {
 		objectClient: objectClient,
 	}
 }
+
+type DeploymentsGetter interface {
+	Deployments(namespace string) DeploymentInterface
+}
+
+func (c *Client) Deployments(namespace string) DeploymentInterface {
+	objectClient := objectclient.NewObjectClient(namespace, c.restClient, &DeploymentResource, DeploymentGroupVersionKind, deploymentFactory{})
+	return &deploymentClient{
+		ns:           namespace,
+		client:       c,
+		objectClient: objectClient,
+	}
+}

types/apis/apps/v1/zz_generated_scheme.go

@@ -34,6 +34,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 
 		&DaemonSetList{},
+		&DeploymentList{},
 	)
 	return nil
 }

types/codegen/main.go

@@ -100,6 +100,7 @@ func main() {
 
 	if err := generator.ControllersForForeignTypes(basePackage, appsv1.SchemeGroupVersion, []interface{}{
 		appsv1.DaemonSet{},
+		appsv1.Deployment{},
 	}, nil); err != nil {
 		logrus.Fatal(err)
 	}