Skip to content

Commit 994d952

Browse files
leon-infleon-inf
authored
chore: move the instance template out of ITS (#9722)
1 parent 0c3b7d4 commit 994d952

26 files changed

+17
-15
lines changed

‎pkg/controller/component/workload_utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
3636
"github.com/apecloud/kubeblocks/pkg/constant"
3737
"github.com/apecloud/kubeblocks/pkg/controller/instanceset"
38-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
38+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
3939
"github.com/apecloud/kubeblocks/pkg/generics"
4040
)
4141

‎pkg/controller/instanceset/in_place_update_util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
3232
"github.com/apecloud/kubeblocks/pkg/constant"
33-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
33+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
3434
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
3535
viper "github.com/apecloud/kubeblocks/pkg/viperx"
3636
)

‎pkg/controller/instanceset/instance_util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
4343
"github.com/apecloud/kubeblocks/pkg/constant"
4444
"github.com/apecloud/kubeblocks/pkg/controller/builder"
45-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
45+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
4646
"github.com/apecloud/kubeblocks/pkg/controller/model"
4747
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
4848
)

‎pkg/controller/instanceset/instance_util_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
3636
"github.com/apecloud/kubeblocks/pkg/constant"
3737
"github.com/apecloud/kubeblocks/pkg/controller/builder"
38-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
38+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
3939
)
4040

4141
var _ = Describe("instance util test", func() {

‎pkg/controller/instanceset/reconciler_instance_alignment.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
2828
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
2929
"github.com/apecloud/kubeblocks/pkg/constant"
30-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
30+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
3131
"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
3232
"github.com/apecloud/kubeblocks/pkg/controller/model"
3333
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"

‎pkg/controller/instanceset/reconciler_revision_update.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525

2626
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
27-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
27+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
2828
"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
2929
"github.com/apecloud/kubeblocks/pkg/controller/model"
3030
)

‎pkg/controller/instanceset/reconciler_status.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/apimachinery/pkg/util/sets"
3232

3333
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
34-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
34+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
3535
"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
3636
"github.com/apecloud/kubeblocks/pkg/controller/model"
3737
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"

‎pkg/controller/instanceset/reconciler_update.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
3535
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
3636
"github.com/apecloud/kubeblocks/pkg/constant"
37-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
37+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
3838
"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
3939
"github.com/apecloud/kubeblocks/pkg/controller/lifecycle"
4040
"github.com/apecloud/kubeblocks/pkg/controller/model"

‎pkg/controller/instanceset/reconciler_validation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package instanceset
2121

2222
import (
2323
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
24-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
24+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
2525
"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
2626
)
2727

‎pkg/controller/instanceset2/instance_util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
3737
"github.com/apecloud/kubeblocks/pkg/constant"
3838
"github.com/apecloud/kubeblocks/pkg/controller/builder"
39-
"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
39+
"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
4040
"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
4141
"github.com/apecloud/kubeblocks/pkg/controller/model"
4242
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"

0 commit comments

Comments
 (0)