custom alerting resolve conflicts

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

View File

@@ -17,8 +17,10 @@ limitations under the License.
package k8s
import (
promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
"strings"
snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned"
promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
istioclient "istio.io/client-go/pkg/clientset/versioned"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/client-go/discovery"
@@ -26,7 +28,6 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
"strings"
)
type Client interface {