Skip to content

Commit

Permalink
deploy: remove deployer pod controller
Browse files Browse the repository at this point in the history
  • Loading branch information
0xmichalis committed Jul 11, 2016
1 parent c49b472 commit 84e1faf
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 673 deletions.
5 changes: 0 additions & 5 deletions pkg/cmd/server/origin/master_config.go
Expand Up @@ -659,11 +659,6 @@ func (c *MasterConfig) DeploymentControllerClients() (*osclient.Client, *kclient
return osClient, kClient
}

// DeployerPodControllerClient returns the deployer pod controller client object
func (c *MasterConfig) DeployerPodControllerClient() *kclient.Client {
return c.PrivilegedLoopbackKubernetesClient
}

// DeploymentConfigClients returns deploymentConfig and deployment client objects
func (c *MasterConfig) DeploymentConfigClients() (*osclient.Client, *kclient.Client) {
return c.PrivilegedLoopbackOpenShiftClient, c.PrivilegedLoopbackKubernetesClient
Expand Down
13 changes: 0 additions & 13 deletions pkg/cmd/server/origin/run_components.go
Expand Up @@ -34,7 +34,6 @@ import (
"github.com/openshift/origin/pkg/cmd/server/crypto"
cmdutil "github.com/openshift/origin/pkg/cmd/util"
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
deployerpodcontroller "github.com/openshift/origin/pkg/deploy/controller/deployerpod"
deploycontroller "github.com/openshift/origin/pkg/deploy/controller/deployment"
deployconfigcontroller "github.com/openshift/origin/pkg/deploy/controller/deploymentconfig"
triggercontroller "github.com/openshift/origin/pkg/deploy/controller/generictrigger"
Expand Down Expand Up @@ -333,18 +332,6 @@ func (c *MasterConfig) RunDeploymentController() {
go controller.Run(5, stopCh)
}

// RunDeployerPodController starts the deployer pod controller process.
func (c *MasterConfig) RunDeployerPodController() {
kclient := c.DeployerPodControllerClient()
factory := deployerpodcontroller.DeployerPodControllerFactory{
KubeClient: kclient,
Codec: c.EtcdHelper.Codec(),
}

controller := factory.Create()
controller.Run()
}

// RunDeploymentConfigController starts the deployment config controller process.
func (c *MasterConfig) RunDeploymentConfigController() {
dcInfomer := c.Informers.DeploymentConfigs().Informer()
Expand Down
148 changes: 0 additions & 148 deletions pkg/deploy/controller/deployerpod/controller.go

This file was deleted.

0 comments on commit 84e1faf

Please sign in to comment.