Skip to content

Commit 421789f

Browse files
committed
fix: get running its in load resource
1 parent fd9d4c9 commit 421789f

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

controllers/apps/component/transformer_component_load_resources.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828

2929
appsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
30+
workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
3031
appsutil "github.com/apecloud/kubeblocks/controllers/apps/util"
3132
"github.com/apecloud/kubeblocks/pkg/controller/component"
3233
"github.com/apecloud/kubeblocks/pkg/controller/graph"
@@ -72,6 +73,12 @@ func (t *componentLoadResourcesTransformer) transformForNativeComponent(transCtx
7273
}
7374
transCtx.SynthesizeComponent = synthesizedComp
7475

76+
runningITS, err := t.runningInstanceSetObject(transCtx, synthesizedComp)
77+
if err != nil {
78+
return err
79+
}
80+
transCtx.RunningWorkload = runningITS
81+
7582
return nil
7683
}
7784

@@ -91,3 +98,16 @@ func getNCheckCompDefinition(ctx context.Context, cli client.Reader, name string
9198
}
9299
return compDef, nil
93100
}
101+
102+
func (t *componentLoadResourcesTransformer) runningInstanceSetObject(ctx *componentTransformContext,
103+
synthesizeComp *component.SynthesizedComponent) (*workloads.InstanceSet, error) {
104+
objs, err := component.ListOwnedWorkloads(ctx.GetContext(), ctx.GetClient(),
105+
synthesizeComp.Namespace, synthesizeComp.ClusterName, synthesizeComp.Name)
106+
if err != nil {
107+
return nil, err
108+
}
109+
if len(objs) == 0 {
110+
return nil, nil
111+
}
112+
return objs[0], nil
113+
}

controllers/apps/component/transformer_component_workload.go

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@ func (t *componentWorkloadTransformer) Transform(ctx graph.TransformContext, dag
6565
comp := transCtx.Component
6666
synthesizeComp := transCtx.SynthesizeComponent
6767

68-
runningITS, err := t.runningInstanceSetObject(ctx, synthesizeComp)
69-
if err != nil {
70-
return err
68+
var runningITS *workloads.InstanceSet
69+
if transCtx.RunningWorkload != nil {
70+
runningITS = transCtx.RunningWorkload.(*workloads.InstanceSet)
7171
}
72-
transCtx.RunningWorkload = runningITS
7372

7473
protoITS, err := factory.BuildInstanceSet(synthesizeComp, compDef)
7574
if err != nil {
@@ -100,19 +99,6 @@ func (t *componentWorkloadTransformer) Transform(ctx graph.TransformContext, dag
10099
return err
101100
}
102101

103-
func (t *componentWorkloadTransformer) runningInstanceSetObject(ctx graph.TransformContext,
104-
synthesizeComp *component.SynthesizedComponent) (*workloads.InstanceSet, error) {
105-
objs, err := component.ListOwnedWorkloads(ctx.GetContext(), ctx.GetClient(),
106-
synthesizeComp.Namespace, synthesizeComp.ClusterName, synthesizeComp.Name)
107-
if err != nil {
108-
return nil, err
109-
}
110-
if len(objs) == 0 {
111-
return nil, nil
112-
}
113-
return objs[0], nil
114-
}
115-
116102
func (t *componentWorkloadTransformer) reconcileWorkload(ctx context.Context, cli client.Reader,
117103
synthesizedComp *component.SynthesizedComponent, comp *appsv1.Component, runningITS, protoITS *workloads.InstanceSet) error {
118104
// if runningITS already exists, the image changes in protoITS will be

0 commit comments

Comments
 (0)