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.

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

chore: update the group of the ops to "operations" #8162

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

wangyelei
Copy link
Contributor

No description provided.

@wangyelei wangyelei marked this pull request as draft September 18, 2024 10:44
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Sep 18, 2024
@wangyelei wangyelei marked this pull request as ready for review September 19, 2024 06:50
package v1alpha1

import (
kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
Copy link
Contributor

Choose a reason for hiding this comment

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

kbappsv1 -> appsv1

@@ -39,6 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
opssv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

opssv1alpha1 -> opsv1alpha1

@@ -39,6 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
opssv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

BTW, it's weird that configuration controllers depends on types that defined by ops.

@@ -157,7 +158,7 @@ func kindsForHalt() ([]client.ObjectList, []client.ObjectList) {
namespacedKinds, nonNamespacedKinds := kindsForDoNotTerminate()
namespacedKindsPlus := []client.ObjectList{
&kbappsv1.ComponentList{},
&appsv1alpha1.OpsRequestList{},
&opssv1alpha1.OpsRequestList{},
Copy link
Contributor

Choose a reason for hiding this comment

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

Ops is on top of the cluster and operates on the cluster, so its resources should not be deleted by the cluster controller.

@@ -24,6 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
opssv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

opssv1alpha1 -> opsv1alpha1

@@ -47,6 +47,7 @@ import (
appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
appsv1beta1 "github.com/apecloud/kubeblocks/apis/apps/v1beta1"
dpv1alpha1 "github.com/apecloud/kubeblocks/apis/dataprotection/v1alpha1"
opsv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

@@ -37,6 +37,7 @@ import (
kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
dpv1alpha1 "github.com/apecloud/kubeblocks/apis/dataprotection/v1alpha1"
opssv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto


const (
// name of our custom finalizer
clusterDefinitionFinalizerName = "clusterdefinition.kubeblocks.io/finalizer"
Copy link
Contributor

Choose a reason for hiding this comment

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

Unused?

@@ -34,6 +34,7 @@ import (
appsv1beta1 "github.com/apecloud/kubeblocks/apis/apps/v1beta1"
dpv1alpha1 "github.com/apecloud/kubeblocks/apis/dataprotection/v1alpha1"
extensionsv1alpha1 "github.com/apecloud/kubeblocks/apis/extensions/v1alpha1"
opssv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
Copy link
Contributor

Choose a reason for hiding this comment

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

opssv1alpha1 -> opsv1alpha1

@@ -27,14 +27,14 @@ import (
"k8s.io/apimachinery/pkg/types"
Copy link
Contributor

Choose a reason for hiding this comment

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

Move the file to operations pkg.

Copy link
Contributor

@leon-inf leon-inf left a comment

Choose a reason for hiding this comment

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

The files under deploy/helm/opsdefinitions should be cleaned up.

- api:
crdVersion: v1
namespaced: true
domain: kubeblocks.io
Copy link
Contributor

Choose a reason for hiding this comment

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

controller: true?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants