Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump golang.org/x/text from 0.3.7 to 0.3.8 #9

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
5a8bacf
Merge branch 'feature-yq-devops-3365' into 'master'
Jul 27, 2022
9fa5bae
[IMP] 修改Dockerfile
Jul 27, 2022
05acdc8
Merge branch 'feature-yq-devops-3365' into 'master'
Jul 27, 2022
2754087
[FIX] 在annotations上添加choerodon.io/commit
Aug 16, 2022
0c5af9d
Merge branch 'hotfix-2.2.0' into 'master'
Aug 16, 2022
23570c2
[FIX] 修复在annotations上添加choerodon.io/commit
Aug 17, 2022
7b75be5
[IMP] 修改go.mod
Aug 16, 2022
341bd5a
[IMP] 升级k8s版本到v0.24.3
Aug 17, 2022
e503133
[IMP] 修改golang编译版本
Aug 18, 2022
83c567f
[IMP] 兼容处理
Aug 19, 2022
d7ff15d
[IMP] polaris
Aug 23, 2022
fe7bde5
Merge branch 'feature-yq-devops-3578' into 'master'
Aug 23, 2022
367f756
[IMP] 部署实例时如果命名空间不存在就创建
Aug 23, 2022
a1fc734
Merge branch 'feature-yq-devops-3578' into 'master'
Aug 23, 2022
9091b6a
[IMP] 修改变量设置
Aug 23, 2022
e1d8936
Merge branch 'feature-yq-devops-3578' into 'master'
Aug 23, 2022
82ff377
[IMP] 修改部署和升级实例失败时资源渲染逻辑
Aug 31, 2022
6e64e0e
Merge branch 'feature-yq-devops-3578' into 'master'
Aug 31, 2022
d0707c6
Merge branch 'master' into 'hotfix-2.2.0'
Sep 1, 2022
ca7eab8
Merge branch 'hotfix-2.2.0' into 'master'
Sep 1, 2022
b690e65
[FIX] 修复下载私有chart
Sep 13, 2022
6aed5a4
Merge branch 'feature-yq-devops-3578' into 'master'
Sep 13, 2022
db93019
[FIX] 修复同步PV资源
Sep 13, 2022
5a0fc7b
Merge branch 'feature-yq-devops-3578' into 'master'
Sep 13, 2022
e03988a
[FIX] 修复渲染hook资源名称不正确问题
Sep 15, 2022
0b4ade8
Merge branch 'feature-yq-devops-3578' into 'master'
Sep 15, 2022
dce70e1
[FIX] 修复获取k8s版本
Sep 19, 2022
74d0566
Merge branch 'feature-yq-devops-3578' into 'master'
Sep 19, 2022
a0b2ca4
[FIX] 修复解析k8s版本
Sep 19, 2022
71b163c
Merge branch 'feature-yq-devops-3578' into 'master'
Sep 19, 2022
50da1d7
[IMP] 权限限制模式下也返回k8s集群版本信息
Sep 19, 2022
63c3825
Merge branch 'feature-yq-devops-3578' into 'master'
Sep 19, 2022
3ef6f82
[FIX] 修复agent升级后配置丢失问题
Sep 20, 2022
f637f32
[ADD] 添加健康探针
Sep 23, 2022
dcbf50a
Merge branch 'yq-devops-4201' into 'master'
Sep 23, 2022
105c1d0
[IMP] 修改健康检查
Sep 23, 2022
bc53327
Merge branch 'yq-devops-4201' into 'master'
Sep 23, 2022
7ded30f
[IMP]优化chart
TimeBye Sep 26, 2022
b5a0c2f
[IMP] 添加日志打印
Sep 26, 2022
f2e3281
[IMP] 修改健康检查端口设置
Sep 26, 2022
ccddbab
[IMP] 升级实例时,保留上一次replicas数量
Sep 27, 2022
3861324
Merge branch 'imp-chart' into 'master'
Sep 29, 2022
533806d
Merge branch 'hotfix-2.2.4' into 'master'
Sep 29, 2022
4784145
[ADD] chart添加端口号兼容旧版本
Oct 10, 2022
0d68a16
[IMP] 修改升级时保存agent配置
Oct 10, 2022
c2d86d8
Merge branch 'feature-yq-devops-3578' into 'master'
Oct 10, 2022
ef4200d
Merge branch 'hotfix-2.0.2' into 'master'
Oct 24, 2022
35818cd
[IMP] 优化抓取集群节点信息
Oct 24, 2022
6a297f2
Merge branch 'feature-yq-devops-node' into 'master'
Oct 24, 2022
abd5a3a
[IMP] 优化cert-manager状态返回
Oct 25, 2022
d91dfb8
Merge branch 'feature-yq-devops-node' into 'master'
Oct 25, 2022
c138c87
[IMP] websocket重连等待时间设置为随机时间
Oct 26, 2022
51973e0
Merge branch 'feature-yq-devops-websocket' into 'master'
Oct 26, 2022
51f37dd
[IMP] 优化随机数生成
Oct 26, 2022
6f922fa
Merge branch 'feature-yq-devops-websocket' into 'master'
Oct 26, 2022
860571d
[IMP] 优化agent就绪设置逻辑
Oct 28, 2022
dd66f6f
Merge branch 'feature-yq-devops-websocket' into 'master'
Oct 28, 2022
a41220a
[ADD] 添加replicas生效策略
Nov 17, 2022
c748a51
Merge branch 'feature-yq-devops-4941' into 'master'
Nov 17, 2022
b218e28
[FIX] 修改polaris获取的集群版本
Nov 28, 2022
7b6be4c
Merge branch 'hotfix-2.2.12' into 'master'
Dec 12, 2022
01847cd
[IMP] 兼容权限限制模式下部署实例
Dec 23, 2022
0419322
Merge branch 'hotfix-2.2.13' into 'master'
Dec 23, 2022
ba83035
[IMP] 添加实例部署日志打印
Jan 3, 2023
bbc0ecd
[IMP] 兼容1.22以上版本的k8s集群安装cert-manager
Jan 4, 2023
3bbbc41
[IMP] 修改cert-manager的crd
Jan 4, 2023
769d6f5
Merge branch 'feature-yq-devops-5338' into 'master'
Jan 4, 2023
c7be6c6
Bump golang.org/x/text from 0.3.7 to 0.3.8
dependabot[bot] Feb 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[IMP] 优化cert-manager状态返回
  • Loading branch information
李浩 committed Oct 25, 2022
commit abd5a3a6f3c2e2eb97a1f78afffd4003203b7fe4
6 changes: 3 additions & 3 deletions pkg/agent/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ func (w *workerManager) runWorker() {
}
}

//监听cert-mgr的pod运行情况
// 监听cert-mgr的pod运行情况
func (w *workerManager) monitorCertMgr() {

for {
time.Sleep(10 * time.Second)
time.Sleep(1 * time.Minute)
podStatusInfo, err := w.getPodStatus()
if err != nil {
glog.Error(err)
Expand All @@ -189,7 +189,7 @@ func (w *workerManager) monitorCertMgr() {
}
}

//得到pod的状态
// 得到pod的状态
func (w *workerManager) getPodStatus() (model.CertManagerStatusInfo, error) {
info := model.CertManagerStatusInfo{}
podList := &v1.PodList{}
Expand Down