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

Bug 1950409: Update v1beta1 references to v1 #187

Merged
merged 1 commit into from Apr 16, 2021
Merged

Bug 1950409: Update v1beta1 references to v1 #187

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ This process refers to building the operator in a way that it can be installed l
A sample CR definition looks like below (the operator expects `cluster` CR under `openshift-kube-descheduler-operator` namespace):

```yaml
apiVersion: operator.openshift.io/v1beta1
apiVersion: operator.openshift.io/v1
kind: KubeDescheduler
metadata:
name: cluster
Expand Down
2 changes: 1 addition & 1 deletion deploy/02_kube-descheduler-operator.cr.yaml
View file
Open in desktop
@@ -1,4 +1,4 @@
apiVersion: operator.openshift.io/v1beta1
apiVersion: operator.openshift.io/v1
kind: KubeDescheduler
metadata:
name: cluster
Expand Down
4 changes: 2 additions & 2 deletions manifests/4.8/cluster-kube-descheduler-operator.v4.8.0.clusterserviceversion.yaml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ metadata:
alm-examples: |
[
{
"apiVersion": "operator.openshift.io/v1beta1",
"apiVersion": "operator.openshift.io/v1",
"kind": "KubeDescheduler",
"metadata": {
"name": "cluster",
Expand Down Expand Up @@ -38,7 +38,7 @@ spec:
group: operator.openshift.io
kind: KubeDescheduler
name: kubedeschedulers.operator.openshift.io
version: v1beta1
version: v1
description: |
The Kube Descheduler Operator provides the ability to evict a running pod so that the pod can be rescheduled onto a more suitable node.

Expand Down
10 changes: 5 additions & 5 deletions pkg/operator/target_config_reconciler.go
View file
Open in desktop
Expand Up @@ -146,7 +146,7 @@ func (c *TargetConfigReconciler) manageRole(descheduler *deschedulerv1.KubeDesch
required.Namespace = descheduler.Namespace
required.OwnerReferences = []metav1.OwnerReference{
{
APIVersion: "v1beta1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we might actually define a function to generated the owner here:

function ownerRef(descheduler *deschedulerv1.KubeDescheduler) metav1.OwnerReference {
	return {
		APIVersion: "v1",
		Kind:       "KubeDescheduler",
		Name:       descheduler.Name,
		UID:        descheduler.UID,
	}
}

APIVersion: "v1",
Kind: "KubeDescheduler",
Name: descheduler.Name,
UID: descheduler.UID,
Expand All @@ -161,7 +161,7 @@ func (c *TargetConfigReconciler) manageRoleBinding(descheduler *deschedulerv1.Ku
required.Namespace = descheduler.Namespace
required.OwnerReferences = []metav1.OwnerReference{
{
APIVersion: "v1beta1",
APIVersion: "v1",
Kind: "KubeDescheduler",
Name: descheduler.Name,
UID: descheduler.UID,
Expand All @@ -176,7 +176,7 @@ func (c *TargetConfigReconciler) manageService(descheduler *deschedulerv1.KubeDe
required.Namespace = descheduler.Namespace
required.OwnerReferences = []metav1.OwnerReference{
{
APIVersion: "v1beta1",
APIVersion: "v1",
Kind: "KubeDescheduler",
Name: descheduler.Name,
UID: descheduler.UID,
Expand All @@ -196,7 +196,7 @@ func (c *TargetConfigReconciler) manageConfigMap(descheduler *deschedulerv1.Kube
required.Namespace = descheduler.Namespace
required.OwnerReferences = []metav1.OwnerReference{
{
APIVersion: "v1beta1",
APIVersion: "v1",
Kind: "KubeDescheduler",
Name: descheduler.Name,
UID: descheduler.UID,
Expand Down Expand Up @@ -248,7 +248,7 @@ func (c *TargetConfigReconciler) manageDeployment(descheduler *deschedulerv1.Kub
required.Namespace = descheduler.Namespace
required.OwnerReferences = []metav1.OwnerReference{
{
APIVersion: "v1beta1",
APIVersion: "v1",
Kind: "KubeDescheduler",
Name: descheduler.Name,
UID: descheduler.UID,
Expand Down