Skip to content

Commit ea58242

Browse files
committed
fix: 修改文档
1 parent 51a164a commit ea58242

File tree

7 files changed

+24
-17
lines changed

7 files changed

+24
-17
lines changed

README.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,21 @@ metadata:
1818
name: mymessage
1919
spec:
2020
sender:
21-
open: true
21+
open: true # 是否开启发送功能
22+
# email 配置
2223
remote: smtp.qq.com
2324
port: 25
2425
2526
password: xxxxx
2627
2728
feishu:
28-
open: true
29+
open: true # 是否开启发送功能
2930
webhook: xxxxxx # 飞书 webhook ip
30-
type: card # 支持 text card 推送模式
31-
```
31+
type: card # 预计支持 text card 推送模式
32+
```
33+
34+
- 发送结果如下
35+
![](https://github.com/googs1025/message-operator/blob/main/image/img.png?raw=true)
36+
37+
![](https://github.com/googs1025/message-operator/blob/main/image/img_1.png?raw=true)
38+

image/img.png

85.1 KB
Loading

image/img_1.png

169 KB
Loading

main.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ func main() {
5353
k8sConfig.InitInformerFactory()
5454

5555
// 3. 控制器相关
56-
messageCtl := controller.NewMessageController(mgr.GetEventRecorderFor("message-operator"))
56+
messageCtl := controller.NewMessageController(mgr.GetEventRecorderFor("message-operator"), mgr.GetLogger())
5757

58-
err = builder.ControllerManagedBy(mgr).
59-
For(&messagev1alpha1.Message{}).
60-
Complete(messageCtl)
58+
err = builder.ControllerManagedBy(mgr).For(&messagev1alpha1.Message{}).Complete(messageCtl)
6159

6260
// 4. 载入业务配置
6361
if err = sysconfig.InitConfig(); err != nil {
@@ -67,7 +65,7 @@ func main() {
6765

6866
errC := make(chan error)
6967

70-
// 5. 启动controller管理器
68+
// 5. 启动 controller 管理器
7169
go func() {
7270
klog.Info("controller start!! ")
7371
if err = mgr.Start(signals.SetupSignalHandler()); err != nil {

pkg/controller/controller.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package controller
22

33
import (
44
"context"
5+
"github.com/go-logr/logr"
56
messagev1alpha1 "github.com/myoperator/messageoperator/pkg/apis/message/v1alpha1"
67
"github.com/myoperator/messageoperator/pkg/sysconfig"
78
corev1 "k8s.io/api/core/v1"
@@ -14,10 +15,11 @@ import (
1415
type MessageController struct {
1516
client.Client
1617
EventRecorder record.EventRecorder // 事件管理器
18+
logr.Logger
1719
}
1820

19-
func NewMessageController(eventRecorder record.EventRecorder) *MessageController {
20-
return &MessageController{EventRecorder: eventRecorder}
21+
func NewMessageController(eventRecorder record.EventRecorder, log logr.Logger) *MessageController {
22+
return &MessageController{EventRecorder: eventRecorder, Logger: log}
2123
}
2224

2325
// Reconcile 调协loop
@@ -48,12 +50,12 @@ func (r *MessageController) Reconcile(ctx context.Context, req reconcile.Request
4850
return reconcile.Result{}, nil
4951
}
5052
r.EventRecorder.Event(message, corev1.EventTypeNormal, "Update", "update app config...")
51-
53+
5254
klog.Info("CreateOrUpdate ", "Message: ", message.Name, "/", message.Namespace)
5355
return reconcile.Result{}, nil
5456
}
5557

56-
// InjectClient 使用controller-runtime 需要注入的client
58+
// InjectClient 使用 controller-runtime 需要注入的client
5759
func (r *MessageController) InjectClient(c client.Client) error {
5860
r.Client = c
5961
return nil

test/test_card.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func main() {
11-
webhookURL := "https://open.feishu.cn/open-apis/bot/v2/hook/919c368d-bbbf-4858-b788-0b78a4389d45" // 替换为您的飞书机器人 Webhook URL
11+
webhookURL := "https://open.feishu.cn/open-apis/bot/v2/hook/xxx" // 替换为您的飞书机器人 Webhook URL
1212

1313
// 构建卡片消息内容
1414
cardMessage := map[string]interface{}{

yaml/example.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ metadata:
44
name: mymessage
55
spec:
66
sender:
7-
open: true
7+
open: true # 是否开启发送功能
88
remote: smtp.qq.com
99
port: 25
1010
1111
password: cswkxalurhtwecge
1212
1313
feishu:
14-
open: true
14+
open: true # 是否开启发送功能
1515
webhook: xxxxxx # 飞书 webhook ip
16-
type: card # 支持 text card 推送模式
16+
type: card # 支持 text card 推送模式
1717

0 commit comments

Comments
 (0)