Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deploy: set ownerRef from RC to grouped API version #14582

Merged
merged 1 commit into from
Jun 12, 2017
Merged

deploy: set ownerRef from RC to grouped API version #14582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions pkg/deploy/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down