admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

custom alerting resolve conflicts

Browse Source 
Signed-off-by: junotx <junotx@126.com>
This commit is contained in:
junotx
2021-01-07 17:32:37 +08:00
parent 9831eb3533
commit 6f9d306368
37 changed files with 14 additions and 3053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kapis/customalerting/v1alpha1/handler.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package v1alpha1
import (
promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
"github.com/emicklei/go-restful"
promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
"k8s.io/klog"
ksapi "kubesphere.io/kubesphere/pkg/api"
"kubesphere.io/kubesphere/pkg/api/customalerting/v1alpha1"