Skip to content

Commit 3f2d28d

Browse files
committed
its2 test
1 parent 8d677bc commit 3f2d28d

17 files changed

+788
-326
lines changed

apis/workloads/v1/instance_types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ type InstanceSpec struct {
132132
//
133133
// +optional
134134
InstanceAssistantObjects []InstanceAssistantObject `json:"instanceAssistantObjects,omitempty"`
135+
136+
// Indicate whether the instance is scaled down.
137+
//
138+
// +optional
139+
ScaledDown *bool `json:"scaledDown,omitempty"`
135140
}
136141

137142
// InstanceStatus2 defines the observed state of Instance

apis/workloads/v1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/workloads.kubeblocks.io_instances.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,6 +1467,9 @@ spec:
14671467
- name
14681468
type: object
14691469
type: array
1470+
scaledDown:
1471+
description: Indicate whether the instance is scaled down.
1472+
type: boolean
14701473
selector:
14711474
description: |-
14721475
Represents a label query over pods that should match the desired replica count indicated by the `replica` field.

controllers/workloads/instance_controller.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,22 @@ type InstanceReconciler struct {
5050
//+kubebuilder:rbac:groups=workloads.kubeblocks.io,resources=instances/status,verbs=get;update;patch
5151
//+kubebuilder:rbac:groups=workloads.kubeblocks.io,resources=instances/finalizers,verbs=update
5252

53-
// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;update;patch;delete;deletecollection
53+
// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;update;patch;delete
5454
// +kubebuilder:rbac:groups=core,resources=pods/status,verbs=get
5555
// +kubebuilder:rbac:groups=core,resources=pods/finalizers,verbs=update
5656

5757
// +kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
5858
// +kubebuilder:rbac:groups=core,resources=persistentvolumeclaims/status,verbs=get
5959
// +kubebuilder:rbac:groups=core,resources=persistentvolumeclaims/finalizers,verbs=update
6060

61-
// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete;deletecollection
61+
// +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
62+
// +kubebuilder:rbac:groups=core,resources=services/status,verbs=get
63+
// +kubebuilder:rbac:groups=core,resources=services/finalizers,verbs=update
64+
65+
// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
6266
// +kubebuilder:rbac:groups=core,resources=configmaps/finalizers,verbs=update
6367

64-
// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete;deletecollection
68+
// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
6569
// +kubebuilder:rbac:groups=core,resources=secrets/finalizers,verbs=update
6670

6771
// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;delete
@@ -89,8 +93,9 @@ func (r *InstanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
8993
Prepare(instance.NewTreeLoader()).
9094
Do(instance.NewFixMetaReconciler()).
9195
Do(instance.NewDeletionReconciler()).
92-
Do(instance.NewStatusReconciler()).
9396
Do(instance.NewRevisionUpdateReconciler()).
97+
Do(instance.NewStatusReconciler()).
98+
// Do(instance.NewRevisionUpdateReconciler()).
9499
Do(instance.NewAssistantObjectReconciler()).
95100
Do(instance.NewAlignmentReconciler()).
96101
Do(instance.NewUpdateReconciler()).
@@ -106,6 +111,7 @@ func (r *InstanceReconciler) SetupWithManager(mgr ctrl.Manager) error {
106111
}).
107112
Owns(&corev1.Pod{}).
108113
Owns(&corev1.PersistentVolumeClaim{}).
114+
Owns(&corev1.Service{}).
109115
Owns(&corev1.ConfigMap{}).
110116
Owns(&corev1.Secret{}).
111117
Owns(&corev1.ServiceAccount{}).

0 commit comments

Comments
 (0)