This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-operator.git
commit b59100746cf5a8310f7309817b80d6963be55f95 Merge: 1a8cf4c 8ef4531 Author: nobolity <[email protected]> AuthorDate: Sun Jun 12 14:56:23 2022 +0800 Merge remote-tracking branch 'origin/webhook' # Conflicts: # controllers/dsmaster_controller.go # controllers/dsworker_controller.go config/crd/kustomization.yaml | 16 ++++++++-------- config/manager/kustomization.yaml | 4 ++-- config/rbac/role.yaml | 36 ++++++++++++++++++++++++++++++++++++ controllers/dsalert_controller.go | 3 +++ controllers/dsapi_controller.go | 3 +++ controllers/dsmaster_controller.go | 8 ++++++-- controllers/dsworker_controller.go | 9 +++++---- controllers/master_reconcile.go | 1 + 8 files changed, 64 insertions(+), 16 deletions(-) diff --cc controllers/dsmaster_controller.go index 43ca9ca,b001b84..01ca5b7 --- a/controllers/dsmaster_controller.go +++ b/controllers/dsmaster_controller.go @@@ -57,10 -58,9 +58,13 @@@ type DSMasterReconciler struct //+kubebuilder:rbac:groups=ds.apache.dolphinscheduler.dev,resources=dsmasters,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups=ds.apache.dolphinscheduler.dev,resources=dsmasters/status,verbs=get;update;patch //+kubebuilder:rbac:groups=ds.apache.dolphinscheduler.dev,resources=dsmasters/finalizers,verbs=update +// +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;create;delete;list;watch + //+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete + //+kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;create;update;patch;delete + //+kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;patch;delete // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state.
