Merge branch 'master' of https://github.com/KubeOperator/KubeOperator - Commit 753c660a - STRLCPY/CVE-2023-22480_KubeOperator

Merge branch 'master' of https://github.com/KubeOperator/KubeOperator
wangzhengkun committed 2 years ago

753c660a

2 parents
15b8a87e
344d5d0e

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

pkg/service/cluster/tools/prometheus.go

		skipped 115 lines
116	116
117	117		if !isInstall {
118	118		if err := p.Cluster.KubeClient.AppsV1().Deployments(p.Cluster.Namespace).Delete(context.TODO(), "prometheus-kube-state-metrics", metav1.DeleteOptions{}); err != nil {
119		-	logger.Log.Info("delete deployment kubeapps-internal-apprepository-controller from %s failed, err: %v", p.Cluster.Namespace, err)
	119	+	logger.Log.Infof("delete deployment kubeapps-internal-apprepository-controller from %s failed, err: %v", p.Cluster.Namespace, err)
120	120		}
121	121		}
122	122
		skipped 21 lines

■ ■ ■ ■ ■ ■

pkg/service/cluster_tool.go

		skipped 73 lines
74	74		if err := db.DB.Where("name = ?", clusterName).Preload("Spec").Preload("Secret").Find(&cluster).Error; err != nil {
75	75		return "", err
76	76		}
77		-	if err := db.DB.Where("name = ?", toolName).First(&tool).Error; err != nil {
	77	+	if err := db.DB.Where("name = ? AND cluster_id = ?", toolName, cluster.ID).First(&tool).Error; err != nil {
78	78		return "", err
79	79		}
80	80
		skipped 367 lines

Please wait...

Page is in error, reload to recover