From 0824d2232b123221899fd8a0c2ccde464d4b322a Mon Sep 17 00:00:00 2001 From: Michal Fojtik Date: Mon, 12 Jun 2017 11:37:47 +0200 Subject: [PATCH] deploy: set ownerRef from RC to grouped API version --- .../deploymentconfig/deploymentconfig_controller.go | 2 +- pkg/deploy/util/util.go | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go b/pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go index 646a2e9cdda4..c9260daccefe 100644 --- a/pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go +++ b/pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go @@ -108,7 +108,7 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig) } return fresh, nil }) - cm := oscontroller.NewRCControllerRefManager(c.rcControl, config, selector, deployutil.ControllerKind, canAdoptFunc) + cm := oscontroller.NewRCControllerRefManager(c.rcControl, config, selector, deployutil.DeploymentConfigControllerRefKind, canAdoptFunc) existingDeployments, err := cm.ClaimReplicationControllers(rcList) if err != nil { return fmt.Errorf("error while deploymentConfigController claiming replication controllers: %v", err) diff --git a/pkg/deploy/util/util.go b/pkg/deploy/util/util.go index 487a6ff5d790..e26e7cf34057 100644 --- a/pkg/deploy/util/util.go +++ b/pkg/deploy/util/util.go @@ -18,14 +18,16 @@ import ( kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" kdeplutil "k8s.io/kubernetes/pkg/controller/deployment/util" - osapiv1 "github.com/openshift/origin/pkg/api/v1" deployapi "github.com/openshift/origin/pkg/deploy/api" + deployapiv1 "github.com/openshift/origin/pkg/deploy/api/v1" "github.com/openshift/origin/pkg/util/namer" ) var ( - // ControllerKind contains the schema.GroupVersionKind for this controller type. - ControllerKind = osapiv1.SchemeGroupVersion.WithKind("DeploymentConfig") + // DeploymentConfigControllerRefKind contains the schema.GroupVersionKind for the + // deployment config. This is used in the ownerRef and GC client picks the appropriate + // client to get the deployment config. + DeploymentConfigControllerRefKind = deployapiv1.SchemeGroupVersion.WithKind("DeploymentConfig") ) // NewDeploymentCondition creates a new deployment condition. @@ -238,8 +240,8 @@ func NewControllerRef(config *deployapi.DeploymentConfig) *metav1.OwnerReference blockOwnerDeletion := true isController := true return &metav1.OwnerReference{ - APIVersion: ControllerKind.Version, - Kind: ControllerKind.Kind, + APIVersion: DeploymentConfigControllerRefKind.GroupVersion().String(), + Kind: DeploymentConfigControllerRefKind.Kind, Name: config.Name, UID: config.UID, BlockOwnerDeletion: &blockOwnerDeletion,